From 31e5f164d41ad4781bb610db53f7ab7bb5ddc4f9 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 6 Mar 2015 15:45:04 +0200
Subject: [PATCH] Import unittest.mock if available.

mock is in the stdlib since Python 3.3.
---
 tests/__init__.py                            | 5 +++++
 tests/test_crawl.py                          | 2 +-
 tests/test_downloadermiddleware_robotstxt.py | 2 +-
 tests/test_pipeline_files.py                 | 3 ++-
 tests/test_settings/__init__.py              | 5 +----
 tests/test_spider.py                         | 6 ++----
 tests/test_utils_deprecate.py                | 3 ++-
 tox.ini                                      | 1 -
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index 54e79b318..c6dd45181 100644
--- a/tests/__init__.py
+++ b/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):
diff --git a/tests/test_crawl.py b/tests/test_crawl.py
index 48931d6ff..0fcc7c31e 100644
--- a/tests/test_crawl.py
+++ b/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
diff --git a/tests/test_downloadermiddleware_robotstxt.py b/tests/test_downloadermiddleware_robotstxt.py
index eba337cbd..8b7ac7a6b 100644
--- a/tests/test_downloadermiddleware_robotstxt.py
+++ b/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):
diff --git a/tests/test_pipeline_files.py b/tests/test_pipeline_files.py
index d1bcf5f79..0a1737c44 100644
--- a/tests/test_pipeline_files.py
+++ b/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')
diff --git a/tests/test_settings/__init__.py b/tests/test_settings/__init__.py
index 38797ad45..092806d20 100644
--- a/tests/test_settings/__init__.py
+++ b/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
 
 
diff --git a/tests/test_spider.py b/tests/test_spider.py
index 585b4b53b..56bcb2b1e 100644
--- a/tests/test_spider.py
+++ b/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):
 
diff --git a/tests/test_utils_deprecate.py b/tests/test_utils_deprecate.py
index d31b1d1f3..3d94bc1a0 100644
--- a/tests/test_utils_deprecate.py
+++ b/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
diff --git a/tox.ini b/tox.ini
index 624f550e1..2dff74973 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,7 +50,6 @@ deps =
     w3lib>=1.8.0
     Pillow
     # tests requirements
-    mock
     pytest>=2.6.0
     pytest-twisted