diff --git a/before_after/__init__.py b/before_after/__init__.py index 1081684..e713a61 100644 --- a/before_after/__init__.py +++ b/before_after/__init__.py @@ -50,7 +50,10 @@ def inner(*a, **k): return ret return inner - from mock import patch + if sys.version_info >= (3, 3): + from unittest.mock import patch + else: + from mock import patch patcher = patch(target, **kwargs) original, _ = patcher.get_original() diff --git a/setup.py b/setup.py index 572470c..b1167df 100644 --- a/setup.py +++ b/setup.py @@ -31,8 +31,9 @@ 'Natural Language :: English', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', ], keywords=['testing', 'race conditions'], - install_requires=['mock>=1.0.1'], + install_requires=['mock>=1.0.1; python_version < "3.3"'], )