Scrapy, a fast high-level web crawling & scraping framework for Python.
Remove six.moves occurrences from tests
Eugenio Lacuesta5ab0f189ce33
diff --git a/tests/mockserver.py b/tests/mockserver.pyindex 8aff7b525..15b1b24f5 100644--- a/tests/mockserver.py+++ b/tests/mockserver.py@@ -1,6 +1,10 @@-import sys, time, random, os, json-from six.moves.urllib.parse import urlencode+import json+import os+import random+import sys+import timefrom subprocess import Popen, PIPE+from urllib.parse import urlencodefrom OpenSSL import SSLfrom twisted.web.server import Site, NOT_DONE_YETdiff --git a/tests/spiders.py b/tests/spiders.pyindex 7816bf7c7..72a428c50 100644--- a/tests/spiders.py+++ b/tests/spiders.py@@ -3,7 +3,7 @@ Some spiders used for testing and benchmarking"""import time-from six.moves.urllib.parse import urlencode+from urllib.parse import urlencodefrom scrapy.spiders import Spiderfrom scrapy.http import Requestdiff --git a/tests/test_crawl.py b/tests/test_crawl.pyindex 3fc13eeb7..3307899b7 100644--- a/tests/test_crawl.py+++ b/tests/test_crawl.py@@ -140,7 +140,7 @@ class CrawlTestCase(TestCase):def test_unbounded_response(self):# Completeness of responses without Content-Length or Transfer-Encoding# can not be determined, we treat them as valid but flagged as "partial"- from six.moves.urllib.parse import urlencode+ from urllib.parse import urlencodequery = urlencode({'raw': '''\HTTP/1.1 200 OKServer: Apache-Coyote/1.1diff --git a/tests/test_engine.py b/tests/test_engine.pyindex d5b911a40..002c4e6bb 100644--- a/tests/test_engine.py+++ b/tests/test_engine.py@@ -10,8 +10,10 @@ module with the ``runserver`` argument::python test_engine.py runserver"""-import sys, os, re-from six.moves.urllib.parse import urlparse+import os+import re+import sys+from urllib.parse import urlparsefrom twisted.internet import reactor, deferfrom twisted.web import server, static, utildiff --git a/tests/test_exporters.py b/tests/test_exporters.pyindex 7880c5bf8..f151a1285 100644--- a/tests/test_exporters.py+++ b/tests/test_exporters.py@@ -1,11 +1,11 @@import reimport jsonimport marshal+import pickleimport tempfileimport unittestfrom io import BytesIOfrom datetime import datetime-from six.moves import cPickle as pickleimport lxml.etreeimport sixdiff --git a/tests/test_feedexport.py b/tests/test_feedexport.pyindex b13b16b41..7a71669c3 100644--- a/tests/test_feedexport.py+++ b/tests/test_feedexport.py@@ -2,13 +2,13 @@ import osimport csvimport jsonimport warnings-from io import BytesIOimport tempfileimport shutilimport string+from io import BytesIOfrom unittest import mock-from six.moves.urllib.parse import urljoin, urlparse, quote-from six.moves.urllib.request import pathname2url+from urllib.parse import urljoin, urlparse, quote+from urllib.request import pathname2urlfrom zope.interface.verify import verifyObjectfrom twisted.trial import unittestdiff --git a/tests/test_http_cookies.py b/tests/test_http_cookies.pyindex 0a9ed500a..45ddb42ba 100644--- a/tests/test_http_cookies.py+++ b/tests/test_http_cookies.py@@ -1,4 +1,4 @@-from six.moves.urllib.parse import urlparse+from urllib.parse import urlparsefrom unittest import TestCasefrom scrapy.http import Request, Responsediff --git a/tests/test_http_request.py b/tests/test_http_request.pyindex 807265981..62d2847d7 100644--- a/tests/test_http_request.py+++ b/tests/test_http_request.py@@ -3,12 +3,10 @@ import cgiimport unittestimport reimport json-from unittest import mock-from urllib.parse import unquote_to_bytes+import xmlrpc.client as xmlrpclibimport warnings--from six.moves import xmlrpc_client as xmlrpclib-from six.moves.urllib.parse import urlparse, parse_qs, unquote+from unittest import mock+from urllib.parse import parse_qs, unquote, unquote_to_bytes, urlparsefrom scrapy.http import Request, FormRequest, XmlRpcRequest, JsonRequest, Headers, HtmlResponsefrom scrapy.utils.python import to_bytes, to_unicodediff --git a/tests/test_pipeline_files.py b/tests/test_pipeline_files.pyindex bd40e4103..dede4bf12 100644--- a/tests/test_pipeline_files.py+++ b/tests/test_pipeline_files.py@@ -4,9 +4,9 @@ import timefrom tempfile import mkdtempfrom shutil import rmtreefrom unittest import mock-from six.moves.urllib.parse import urlparse-from six import BytesIO+from urllib.parse import urlparse+from six import BytesIOfrom twisted.trial import unittestfrom twisted.internet import deferdiff --git a/tests/test_proxy_connect.py b/tests/test_proxy_connect.pyindex ae1236bcb..2b62a378d 100644--- a/tests/test_proxy_connect.py+++ b/tests/test_proxy_connect.py@@ -1,15 +1,15 @@import jsonimport osimport time--from six.moves.urllib.parse import urlsplit, urlunsplit+from urllib.parse import urlsplit, urlunsplitfrom threading import Thread+from libmproxy import controller, proxyfrom netlib import http_authfrom testfixtures import LogCapture-from twisted.internet import deferfrom twisted.trial.unittest import TestCase+from scrapy.utils.test import get_crawlerfrom scrapy.http import Requestfrom tests.spiders import SimpleSpider, SingleRequestSpiderdiff --git a/tests/test_spidermiddleware_offsite.py b/tests/test_spidermiddleware_offsite.pyindex 7e4af0d4c..5833591af 100644--- a/tests/test_spidermiddleware_offsite.py+++ b/tests/test_spidermiddleware_offsite.py@@ -1,13 +1,12 @@from unittest import TestCase--from six.moves.urllib.parse import urlparse+from urllib.parse import urlparse+import warningsfrom scrapy.http import Response, Requestfrom scrapy.spiders import Spider-from scrapy.spidermiddlewares.offsite import OffsiteMiddleware-from scrapy.spidermiddlewares.offsite import URLWarning+from scrapy.spidermiddlewares.offsite import OffsiteMiddleware, URLWarningfrom scrapy.utils.test import get_crawler-import warnings+class TestOffsiteMiddleware(TestCase):diff --git a/tests/test_spidermiddleware_referer.py b/tests/test_spidermiddleware_referer.pyindex 21439c20e..23c38d9b1 100644--- a/tests/test_spidermiddleware_referer.py+++ b/tests/test_spidermiddleware_referer.py@@ -1,4 +1,4 @@-from six.moves.urllib.parse import urlparse+from urllib.parse import urlparsefrom unittest import TestCaseimport warningsdiff --git a/tests/test_urlparse_monkeypatches.py b/tests/test_urlparse_monkeypatches.pyindex 22e39821c..bea0cf3e5 100644--- a/tests/test_urlparse_monkeypatches.py+++ b/tests/test_urlparse_monkeypatches.py@@ -1,4 +1,4 @@-from six.moves.urllib.parse import urlparse+from urllib.parse import urlparseimport unittestdiff --git a/tests/test_utils_datatypes.py b/tests/test_utils_datatypes.pyindex 47877f555..8782e4c53 100644--- a/tests/test_utils_datatypes.py+++ b/tests/test_utils_datatypes.py@@ -192,14 +192,6 @@ class SequenceExcludeTest(unittest.TestCase):self.assertIn(20, d)self.assertNotIn(15, d)- def test_six_range(self):- import six.moves- seq = six.moves.range(10**3, 10**6)- d = SequenceExclude(seq)- self.assertIn(10**2, d)- self.assertIn(10**7, d)- self.assertNotIn(10**4, d)-def test_range_step(self):seq = range(10, 20, 3)d = SequenceExclude(seq)diff --git a/tests/test_utils_defer.py b/tests/test_utils_defer.pyindex 003bb9b02..0d8c46657 100644--- a/tests/test_utils_defer.py+++ b/tests/test_utils_defer.py@@ -5,8 +5,6 @@ from twisted.python.failure import Failurefrom scrapy.utils.defer import mustbe_deferred, process_chain, \process_chain_both, process_parallel, iter_errback-from six.moves import xrange-class MustbeDeferredTest(unittest.TestCase):def test_success_function(self):@@ -83,7 +81,7 @@ class IterErrbackTest(unittest.TestCase):def test_iter_errback_good(self):def itergood():- for x in xrange(10):+ for x in range(10):yield xerrors = []@@ -93,7 +91,7 @@ class IterErrbackTest(unittest.TestCase):def test_iter_errback_bad(self):def iterbad():- for x in xrange(10):+ for x in range(10):if x == 5:a = 1/0yield xdiff --git a/tests/test_utils_httpobj.py b/tests/test_utils_httpobj.pyindex 4f9f7a370..cf8ad1f23 100644--- a/tests/test_utils_httpobj.py+++ b/tests/test_utils_httpobj.py@@ -1,9 +1,10 @@import unittest-from six.moves.urllib.parse import urlparse+from urllib.parse import urlparsefrom scrapy.http import Requestfrom scrapy.utils.httpobj import urlparse_cached+class HttpobjUtilsTest(unittest.TestCase):def test_urlparse_cached(self):diff --git a/tests/test_utils_response.py b/tests/test_utils_response.pyindex bea4dade3..6ebf290c0 100644--- a/tests/test_utils_response.py+++ b/tests/test_utils_response.py@@ -1,12 +1,13 @@import osimport unittest-from six.moves.urllib.parse import urlparse+from urllib.parse import urlparsefrom scrapy.http import Response, TextResponse, HtmlResponsefrom scrapy.utils.python import to_bytesfrom scrapy.utils.response import (response_httprepr, open_in_browser,get_meta_refresh, get_base_url, response_status_message)+__doctests__ = ['scrapy.utils.response']diff --git a/tests/test_utils_url.py b/tests/test_utils_url.pyindex e6588055c..a8e37d7b8 100644--- a/tests/test_utils_url.py+++ b/tests/test_utils_url.py@@ -1,14 +1,15 @@# -*- coding: utf-8 -*-import unittest+from urllib.parse import urlparseimport six-from six.moves.urllib.parse import urlparsefrom scrapy.spiders import Spiderfrom scrapy.utils.url import (url_is_from_any_domain, url_is_from_spider,add_http_if_no_scheme, guess_scheme,parse_url, strip_url)+__doctests__ = ['scrapy.utils.url']