Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge remote-tracking branch 'upstream/remove-py2-tests' into remove-six-code
Eugenio Lacuestacca1959c071a
diff --cc tests/test_downloader_handlers.pyindex 6090998d4,e6856945c..5e6a2017e--- a/tests/test_downloader_handlers.py+++ b/tests/test_downloader_handlers.py@@@ -1,9 -1,11 +1,8 @@@import os- import siximport shutilimport tempfile+from unittest import mockimport contextlib-try:- from unittest import mock-except ImportError:- import mockfrom testfixtures import LogCapturefrom twisted.trial import unittestdiff --cc tests/test_proxy_connect.pyindex 2b62a378d,69925f80c..bf56136b1--- a/tests/test_proxy_connect.py+++ b/tests/test_proxy_connect.py@@@ -1,12 -1,14 +1,12 @@@import jsonimport os- import time+ import re-from subprocess import Popen, PIPE+ import sys-import time+from urllib.parse import urlsplit, urlunsplit- from threading import Thread++from subprocess import Popen, PIPE- from libmproxy import controller, proxy- from netlib import http_auth+ import pytest-from six.moves.urllib.parse import urlsplit, urlunsplitfrom testfixtures import LogCapture-from twisted.internet import deferfrom twisted.trial.unittest import TestCasediff --cc tests/test_utils_python.pyindex bea431969,6cb32cbdd..faf0d4b73--- a/tests/test_utils_python.py+++ b/tests/test_utils_python.py@@@ -2,15 -2,15 +2,15 @@@ import gimport functoolsimport operatorimport unittest--from itertools import countimport platform--import six++from itertools import countfrom scrapy.utils.python import (memoizemethod_noargs, binary_is_text, equal_attributes,WeakKeyCache, stringify_dict, get_func_args, to_bytes, to_unicode,without_none_values, MutableChain)++__doctests__ = ['scrapy.utils.python']