Remove more six imports

scrapy/core/downloader/middleware.py

@@ -3,8 +3,6 @@ Downloader Middleware manager
 
 See documentation in docs/topics/downloader-middleware.rst
 """
-import six
-
 from twisted.internet import defer
 
 from scrapy.exceptions import _InvalidOutput

scrapy/core/spidermw.py

@@ -5,7 +5,6 @@ See documentation in docs/topics/spider-middleware.rst
 """
 from itertools import chain, islice
 
-import six
 from twisted.python.failure import Failure
 from scrapy.exceptions import _InvalidOutput
 from scrapy.middleware import MiddlewareManager

scrapy/utils/reqser.py

@@ -1,8 +1,6 @@
 """
 Helper functions for serializing (and deserializing) requests.
 """
-import six
-
 from scrapy.http import Request
 from scrapy.utils.python import to_unicode
 from scrapy.utils.misc import load_object

tests/test_exporters.py

@@ -8,7 +8,6 @@ from io import BytesIO
 from datetime import datetime
 
 import lxml.etree
-import six
 
 from scrapy.item import Item, Field
 from scrapy.utils.python import to_unicode

tests/test_http_response.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-import six
 from w3lib.encoding import resolve_encoding
 
 from scrapy.http import (Request, Response, TextResponse, HtmlResponse,

tests/test_loader.py

@@ -1,8 +1,6 @@
 from functools import partial
 import unittest
 
-import six
-
 from scrapy.http import HtmlResponse
 from scrapy.item import Item, Field
 from scrapy.loader import ItemLoader

tests/test_logformatter.py

@@ -3,7 +3,6 @@ import unittest
 from testfixtures import LogCapture
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase as TwistedTestCase
-import six
 
 from scrapy.crawler import CrawlerRunner
 from scrapy.exceptions import DropItem

tests/test_toplevel.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-import six
+
 import scrapy
 
 

tests/test_utils_iterators.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 import os
-import six
+
 from twisted.trial import unittest
 
 from scrapy.utils.iterators import csviter, xmliter, _body_or_str, xmliter_lxml
 from scrapy.http import XmlResponse, TextResponse, Response
 from tests import get_testdata
 
+
 FOOBAR_NL = u"foo\nbar"
 
 

tests/test_utils_reqser.py

@@ -2,8 +2,6 @@
 import unittest
 import sys
 
-import six
-
 from scrapy.http import Request, FormRequest
 from scrapy.spiders import Spider
 from scrapy.utils.reqser import request_to_dict, request_from_dict, _is_private_method, _mangle_private_name

tests/test_utils_url.py

@@ -2,8 +2,6 @@
 import unittest
 from urllib.parse import urlparse
 
-import six
-
 from scrapy.spiders import Spider
 from scrapy.utils.url import (url_is_from_any_domain, url_is_from_spider,
                               add_http_if_no_scheme, guess_scheme,

tests/test_webclient.py

@@ -3,7 +3,6 @@ from twisted.internet import defer
 Tests borrowed from the twisted.web.client tests.
 """
 import os
-import six
 import shutil
 
 import OpenSSL.SSL