From c3d7e68a2be68d40177c5ada6f7f3a9aae64ed7e Mon Sep 17 00:00:00 2001 From: Lukasz Dobrzanski Date: Wed, 10 Sep 2014 01:15:01 +0100 Subject: [PATCH] Use unittest.mock if available Use unittest.mock https://docs.python.org/3/library/unitetst.mock.html starting from >= Python 3.3 --- flake8/tests/test_engine.py | 5 ++++- setup.py | 14 +++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/flake8/tests/test_engine.py b/flake8/tests/test_engine.py index 5f9d27b..c8dce7f 100644 --- a/flake8/tests/test_engine.py +++ b/flake8/tests/test_engine.py @@ -1,7 +1,10 @@ from __future__ import with_statement import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock # < PY33 from flake8 import engine, util, __version__ diff --git a/setup.py b/setup.py index 5ade5bc..43e9b29 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,18 @@ try: except ImportError: pass +try: + # Use https://docs.python.org/3/library/unittest.mock.html + from unittest import mock +except ImportError: + # < Python 3.3 + mock = None + + +tests_require = ['nose'] +if mock is None: + tests_require += ['mock'] + def get_version(fname='flake8/__init__.py'): with open(fname) as f: @@ -58,6 +70,6 @@ setup( "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Software Development :: Quality Assurance", ], - tests_require=['nose', 'mock'], + tests_require=tests_require, test_suite='nose.collector', )