Rely on backports.unittest_mock (and its pytest plugin) to supply mock.

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
 

cherrypy/test/test_encoding.py

@@ -2,14 +2,14 @@
 
 import gzip
 import io
+from unittest import mock
 
 import six
 
 import cherrypy
 from cherrypy._cpcompat import IncompleteRead, ntob, ntou
 
 from cherrypy.test import helper
-from cherrypy.test.helper import mock
 
 
 europoundUnicode = ntou('£', encoding='utf-8')

cherrypy/test/test_http.py

@@ -4,14 +4,14 @@
 import mimetypes
 import socket
 import sys
+from unittest import mock
 
 import six
 
 import cherrypy
 from cherrypy._cpcompat import HTTPConnection, HTTPSConnection, ntob
 
 from cherrypy.test import helper
-from cherrypy.test.helper import mock
 
 
 def encode_multipart_formdata(files):

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',

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
 ###############################################################################