diff --git a/cherrypy/test/helper.py b/cherrypy/test/helper.py index 4e63e1968..15314212c 100644 --- a/cherrypy/test/helper.py +++ b/cherrypy/test/helper.py @@ -11,11 +11,6 @@ import unittest import warnings -try: - from unittest import mock -except ImportError: - import mock - import nose import six diff --git a/cherrypy/test/test_encoding.py b/cherrypy/test/test_encoding.py index f94e53383..93778dad1 100644 --- a/cherrypy/test/test_encoding.py +++ b/cherrypy/test/test_encoding.py @@ -2,6 +2,7 @@ import gzip import io +from unittest import mock import six @@ -9,7 +10,6 @@ from cherrypy._cpcompat import IncompleteRead, ntob, ntou from cherrypy.test import helper -from cherrypy.test.helper import mock europoundUnicode = ntou('£', encoding='utf-8') diff --git a/cherrypy/test/test_http.py b/cherrypy/test/test_http.py index 464eb4882..8cba5a1eb 100644 --- a/cherrypy/test/test_http.py +++ b/cherrypy/test/test_http.py @@ -4,6 +4,7 @@ import mimetypes import socket import sys +from unittest import mock import six @@ -11,7 +12,6 @@ from cherrypy._cpcompat import HTTPConnection, HTTPSConnection, ntob from cherrypy.test import helper -from cherrypy.test.helper import mock def encode_multipart_formdata(files): diff --git a/cherrypy/wsgiserver/test_wsgiserver.py b/cherrypy/wsgiserver/test_wsgiserver.py index 8435272ba..b1b6741a6 100644 --- a/cherrypy/wsgiserver/test_wsgiserver.py +++ b/cherrypy/wsgiserver/test_wsgiserver.py @@ -1,9 +1,9 @@ +from unittest import mock + import six from cherrypy import wsgiserver -from cherrypy.test.helper import mock - class TestWSGIGateway_u0: @mock.patch('cherrypy.wsgiserver.WSGIGateway_10.get_environ', diff --git a/setup.py b/setup.py index 7c7ccf01e..5332ecb71 100644 --- a/setup.py +++ b/setup.py @@ -110,6 +110,7 @@ 'nose-testconfig', # only used in cherrypy.test.helper 'objgraph', # cherrypy.lib.gctools 'pytest', + 'backports.unittest_mock', ], # Enables memcached session support via `cherrypy[memcached_session]`: 'memcached_session': ['python-memcached>=1.58'], @@ -121,11 +122,6 @@ } """Feature flags end-users can use in dependencies""" -if sys.version_info < (3, 3): - extras_require['testing'].append( - 'mock' # accessed through cherrypy.test.helper.mock - ) - ############################################################################### # end arguments for setup ###############################################################################