1
0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-09 01:03:24 +00:00

collections.Counter is new in Python 2.7

This commit is contained in:
Hugo
2017-12-07 13:20:20 +02:00
parent bfb38af8e1
commit 42762ec806
4 changed files with 5 additions and 10 deletions

View File

@@ -28,9 +28,7 @@ install_requires = ['PyYAML', 'wrapt', 'six>=1.5']
extras_require = { extras_require = {
':python_version in "2.4, 2.5, 2.6"': ':python_version in "2.7"': ['contextlib2', 'mock'],
['contextlib2', 'backport_collections', 'mock'],
':python_version in "2.7, 3.1, 3.2"': ['contextlib2', 'mock'],
':python_version in "3.4, 3.5, 3.6"': ['yarl'], ':python_version in "3.4, 3.5, 3.6"': ['yarl'],
} }

View File

@@ -1,10 +1,11 @@
import collections
import sys import sys
import inspect import inspect
import logging import logging
import wrapt import wrapt
from .compat import contextlib, collections from .compat import contextlib
from .errors import UnhandledHTTPRequestError from .errors import UnhandledHTTPRequestError
from .matchers import requests_match, uri, method from .matchers import requests_match, uri, method
from .patch import CassettePatcherBuilder from .patch import CassettePatcherBuilder

View File

@@ -11,8 +11,4 @@ else:
if not hasattr(contextlib, 'ExitStack'): if not hasattr(contextlib, 'ExitStack'):
import contextlib2 as contextlib import contextlib2 as contextlib
import collections __all__ = ['mock', 'contextlib']
if not hasattr(collections, 'Counter'):
import backport_collections as collections
__all__ = ['mock', 'contextlib', 'collections']

View File

@@ -1,4 +1,5 @@
import copy import copy
import collections
import functools import functools
import inspect import inspect
import os import os
@@ -6,7 +7,6 @@ import types
import six import six
from .compat import collections
from .cassette import Cassette from .cassette import Cassette
from .serializers import yamlserializer, jsonserializer from .serializers import yamlserializer, jsonserializer
from .persisters.filesystem import FilesystemPersister from .persisters.filesystem import FilesystemPersister