Scrapy, a fast high-level web crawling & scraping framework for Python.
Remove cStringIO imports.
Andrey Rakhmatullin85e79ae79275
diff --git a/scrapy/downloadermiddlewares/decompression.py b/scrapy/downloadermiddlewares/decompression.pyindex 49313cc04..e2d73f347 100644--- a/scrapy/downloadermiddlewares/decompression.py+++ b/scrapy/downloadermiddlewares/decompression.py@@ -4,6 +4,7 @@ and extract the potentially compressed responses that may arrive.import bz2import gzip+from io import BytesIOimport zipfileimport tarfileimport logging@@ -11,11 +12,6 @@ from tempfile import mktempimport six-try:- from cStringIO import StringIO as BytesIO-except ImportError:- from io import BytesIO-from scrapy.responsetypes import responsetypeslogger = logging.getLogger(__name__)diff --git a/scrapy/mail.py b/scrapy/mail.pyindex 746468e25..d24de2212 100644--- a/scrapy/mail.py+++ b/scrapy/mail.py@@ -3,13 +3,9 @@ Mail sending helpersSee documentation in docs/topics/email.rst"""+from io import BytesIOimport logging-try:- from cStringIO import StringIO as BytesIO-except ImportError:- from io import BytesIO-from email.utils import COMMASPACE, formatdatefrom six.moves.email_mime_multipart import MIMEMultipartfrom six.moves.email_mime_text import MIMETextdiff --git a/scrapy/pipelines/files.py b/scrapy/pipelines/files.pyindex cc3d10b63..8d74c5011 100644--- a/scrapy/pipelines/files.py+++ b/scrapy/pipelines/files.py@@ -5,6 +5,7 @@ See documentation in topics/media-pipeline.rst"""import functoolsimport hashlib+from io import BytesIOimport mimetypesimport osimport os.path@@ -15,12 +16,6 @@ from six.moves.urllib.parse import urlparsefrom collections import defaultdictimport six--try:- from cStringIO import StringIO as BytesIO-except ImportError:- from io import BytesIO-from twisted.internet import defer, threadsfrom scrapy.pipelines.media import MediaPipelinediff --git a/scrapy/pipelines/images.py b/scrapy/pipelines/images.pyindex fa4d12ad1..e77cef4ff 100644--- a/scrapy/pipelines/images.py+++ b/scrapy/pipelines/images.py@@ -5,13 +5,9 @@ See documentation in topics/media-pipeline.rst"""import functoolsimport hashlib+from io import BytesIOimport six-try:- from cStringIO import StringIO as BytesIO-except ImportError:- from io import BytesIO-from PIL import Imagefrom scrapy.utils.misc import md5sumdiff --git a/scrapy/utils/gz.py b/scrapy/utils/gz.pyindex dc8316d8c..f41e62fe3 100644--- a/scrapy/utils/gz.py+++ b/scrapy/utils/gz.py@@ -1,12 +1,7 @@-import struct--try:- from cStringIO import StringIO as BytesIO-except ImportError:- from io import BytesIOfrom gzip import GzipFile-+from io import BytesIOimport re+import structfrom scrapy.utils.decorators import deprecateddiff --git a/scrapy/utils/iterators.py b/scrapy/utils/iterators.pyindex dbc1e0d20..9693ba768 100644--- a/scrapy/utils/iterators.py+++ b/scrapy/utils/iterators.py@@ -1,11 +1,7 @@import reimport csv-import logging-try:- from cStringIO import StringIO as BytesIO-except ImportError:- from io import BytesIOfrom io import StringIO+import loggingimport sixfrom scrapy.http import TextResponse, Responsediff --git a/tests/test_cmdline/__init__.py b/tests/test_cmdline/__init__.pyindex 68dfb1cca..56cfe642a 100644--- a/tests/test_cmdline/__init__.py+++ b/tests/test_cmdline/__init__.py@@ -1,3 +1,4 @@+from io import StringIOimport jsonimport osimport pstats@@ -7,10 +8,6 @@ from subprocess import Popen, PIPEimport sysimport tempfileimport unittest-try:- from cStringIO import StringIO-except ImportError:- from io import StringIOfrom scrapy.utils.test import get_testenvdiff --git a/tests/test_pipeline_media.py b/tests/test_pipeline_media.pyindex 28e39cefa..ad2618ec9 100644--- a/tests/test_pipeline_media.py+++ b/tests/test_pipeline_media.py@@ -144,10 +144,8 @@ class BaseMediaPipelineTestCase(unittest.TestCase):# The Failure should encapsulate a FileException ...self.assertEqual(failure.value, file_exc)- # ... and if we're running on Python 3 ...- if sys.version_info.major >= 3:- # ... it should have the returnValue exception set as its context- self.assertEqual(failure.value.__context__, def_gen_return_exc)+ # ... and it should have the returnValue exception set as its context+ self.assertEqual(failure.value.__context__, def_gen_return_exc)# Let's calculate the request fingerprint and fake some runtime data...fp = request_fingerprint(request)