Import unittest.mock if available.

mock is in the stdlib since Python 3.3.

tests/__init__.py

@@ -6,6 +6,11 @@ see http://doc.scrapy.org/en/latest/contributing.html#running-tests
 
 import os
 
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
+
 tests_datadir = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'sample_data')
 
 def get_testdata(*paths):

tests/test_crawl.py

@@ -1,9 +1,9 @@
 import json
 import socket
-import mock
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 from scrapy.utils.test import get_crawler, get_testlog
+from tests import mock
 from tests.spiders import FollowAllSpider, DelaySpider, SimpleSpider, \
     BrokenStartRequestsSpider, SingleRequestSpider, DuplicateStartRequestsSpider
 from tests.mockserver import MockServer

tests/test_downloadermiddleware_robotstxt.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 import re
-import mock
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred
 from twisted.trial import unittest
@@ -8,6 +7,7 @@ from scrapy.contrib.downloadermiddleware.robotstxt import RobotsTxtMiddleware
 from scrapy.exceptions import IgnoreRequest, NotConfigured
 from scrapy.http import Request, Response
 from scrapy.settings import Settings
+from tests import mock
 
 
 class RobotsTxtMiddlewareTest(unittest.TestCase):

tests/test_pipeline_files.py

@@ -1,4 +1,3 @@
-import mock
 import os
 import time
 import hashlib
@@ -14,6 +13,8 @@ from scrapy.item import Item, Field
 from scrapy.http import Request, Response
 from scrapy.settings import Settings
 
+from tests import mock
+
 
 def _mocked_download_func(request, info):
     response = request.meta.get('response')

tests/test_settings/__init__.py

@@ -1,12 +1,9 @@
 import six
 import unittest
 import warnings
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 
 from scrapy.settings import Settings, SettingsAttribute, CrawlerSettings
+from tests import mock
 from . import default_settings
 
 

tests/test_spider.py

@@ -3,10 +3,6 @@ import inspect
 import warnings
 from io import BytesIO
 from twisted.trial import unittest
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 
 from scrapy import signals
 from scrapy.spider import Spider, BaseSpider
@@ -20,6 +16,8 @@ from scrapy.exceptions import ScrapyDeprecationWarning
 from scrapy.utils.trackref import object_ref
 from scrapy.utils.test import get_crawler
 
+from tests import mock
+
 
 class SpiderTest(unittest.TestCase):
 

tests/test_utils_deprecate.py

@@ -3,9 +3,10 @@ from __future__ import absolute_import
 import inspect
 import unittest
 import warnings
-import mock
 from scrapy.utils.deprecate import create_deprecated_class
 
+from tests import mock
+
 
 class MyWarning(UserWarning):
     pass

tox.ini

@@ -50,7 +50,6 @@ deps =
     w3lib>=1.8.0
     Pillow
     # tests requirements
-    mock
     pytest>=2.6.0
     pytest-twisted