Scrapy, a fast high-level web crawling & scraping framework for Python.
Remove six types
Eugenio Lacuesta586b25d27e16
diff --git a/scrapy/downloadermiddlewares/ajaxcrawl.py b/scrapy/downloadermiddlewares/ajaxcrawl.pyindex 78b802673..c618e9ffc 100644--- a/scrapy/downloadermiddlewares/ajaxcrawl.py+++ b/scrapy/downloadermiddlewares/ajaxcrawl.py@@ -2,7 +2,6 @@import reimport logging-import sixfrom w3lib import htmlfrom scrapy.exceptions import NotConfigured@@ -66,7 +65,7 @@ class AjaxCrawlMiddleware(object):# XXX: move it to w3lib?-_ajax_crawlable_re = re.compile(six.u(r'<meta\s+name=["\']fragment["\']\s+content=["\']!["\']/?>'))+_ajax_crawlable_re = re.compile(r'<meta\s+name=["\']fragment["\']\s+content=["\']!["\']/?>')def _has_ajaxcrawlable_meta(text):""">>> _has_ajaxcrawlable_meta('<html><head><meta name="fragment" content="!"/></head><body></body></html>')diff --git a/scrapy/utils/python.py b/scrapy/utils/python.pyindex 18fee1964..d32ee5a3a 100644--- a/scrapy/utils/python.py+++ b/scrapy/utils/python.py@@ -7,7 +7,6 @@ import reimport inspectimport weakrefimport errno-import sixfrom functools import partial, wrapsfrom itertools import chainimport sys@@ -162,7 +161,7 @@ def memoizemethod_noargs(method):return new_method-_BINARYCHARS = {six.b(chr(i)) for i in range(32)} - {b"\0", b"\t", b"\n", b"\r"}+_BINARYCHARS = {to_bytes(chr(i)) for i in range(32)} - {b"\0", b"\t", b"\n", b"\r"}_BINARYCHARS |= {ord(ch) for ch in _BINARYCHARS}@deprecated("scrapy.utils.python.binary_is_text")diff --git a/tests/test_utils_trackref.py b/tests/test_utils_trackref.pyindex 480a717e7..16e02f919 100644--- a/tests/test_utils_trackref.py+++ b/tests/test_utils_trackref.py@@ -1,6 +1,7 @@-import siximport unittest+from io import StringIOfrom unittest import mock+from scrapy.utils import trackref@@ -38,12 +39,12 @@ Live ReferencesBar 1 oldest: 0s ago''')- @mock.patch('sys.stdout', new_callable=six.StringIO)+ @mock.patch('sys.stdout', new_callable=StringIO)def test_print_live_refs_empty(self, stdout):trackref.print_live_refs()self.assertEqual(stdout.getvalue(), 'Live References\n\n\n')- @mock.patch('sys.stdout', new_callable=six.StringIO)+ @mock.patch('sys.stdout', new_callable=StringIO)def test_print_live_refs_with_objects(self, stdout):o1 = Foo() # NOQAtrackref.print_live_refs()