From 85e79ae792752353ea60bff3d93f9e77bea300fb Mon Sep 17 00:00:00 2001
From: Andrey Rakhmatullin <wrar@wrar.name>
Date: Tue, 20 Aug 2019 21:09:49 +0500
Subject: [PATCH] Remove cStringIO imports.

---
 scrapy/downloadermiddlewares/decompression.py | 6 +-----
 scrapy/mail.py                                | 6 +-----
 scrapy/pipelines/files.py                     | 7 +------
 scrapy/pipelines/images.py                    | 6 +-----
 scrapy/utils/gz.py                            | 9 ++-------
 scrapy/utils/iterators.py                     | 6 +-----
 tests/test_cmdline/__init__.py                | 5 +----
 tests/test_pipeline_media.py                  | 6 ++----
 8 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/scrapy/downloadermiddlewares/decompression.py b/scrapy/downloadermiddlewares/decompression.py
index 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 bz2
 import gzip
+from io import BytesIO
 import zipfile
 import tarfile
 import logging
@@ -11,11 +12,6 @@ from tempfile import mktemp
 
 import six
 
-try:
-    from cStringIO import StringIO as BytesIO
-except ImportError:
-    from io import BytesIO
-
 from scrapy.responsetypes import responsetypes
 
 logger = logging.getLogger(__name__)
diff --git a/scrapy/mail.py b/scrapy/mail.py
index 746468e25..d24de2212 100644
--- a/scrapy/mail.py
+++ b/scrapy/mail.py
@@ -3,13 +3,9 @@ Mail sending helpers
 
 See documentation in docs/topics/email.rst
 """
+from io import BytesIO
 import logging
 
-try:
-    from cStringIO import StringIO as BytesIO
-except ImportError:
-    from io import BytesIO
-
 from email.utils import COMMASPACE, formatdate
 from six.moves.email_mime_multipart import MIMEMultipart
 from six.moves.email_mime_text import MIMEText
diff --git a/scrapy/pipelines/files.py b/scrapy/pipelines/files.py
index 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 functools
 import hashlib
+from io import BytesIO
 import mimetypes
 import os
 import os.path
@@ -15,12 +16,6 @@ from six.moves.urllib.parse import urlparse
 from collections import defaultdict
 import six
 
-
-try:
-    from cStringIO import StringIO as BytesIO
-except ImportError:
-    from io import BytesIO
-
 from twisted.internet import defer, threads
 
 from scrapy.pipelines.media import MediaPipeline
diff --git a/scrapy/pipelines/images.py b/scrapy/pipelines/images.py
index 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 functools
 import hashlib
+from io import BytesIO
 import six
 
-try:
-    from cStringIO import StringIO as BytesIO
-except ImportError:
-    from io import BytesIO
-
 from PIL import Image
 
 from scrapy.utils.misc import md5sum
diff --git a/scrapy/utils/gz.py b/scrapy/utils/gz.py
index 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 BytesIO
 from gzip import GzipFile
-
+from io import BytesIO
 import re
+import struct
 
 from scrapy.utils.decorators import deprecated
 
diff --git a/scrapy/utils/iterators.py b/scrapy/utils/iterators.py
index dbc1e0d20..9693ba768 100644
--- a/scrapy/utils/iterators.py
+++ b/scrapy/utils/iterators.py
@@ -1,11 +1,7 @@
 import re
 import csv
-import logging
-try:
-    from cStringIO import StringIO as BytesIO
-except ImportError:
-    from io import BytesIO
 from io import StringIO
+import logging
 import six
 
 from scrapy.http import TextResponse, Response
diff --git a/tests/test_cmdline/__init__.py b/tests/test_cmdline/__init__.py
index 68dfb1cca..56cfe642a 100644
--- a/tests/test_cmdline/__init__.py
+++ b/tests/test_cmdline/__init__.py
@@ -1,3 +1,4 @@
+from io import StringIO
 import json
 import os
 import pstats
@@ -7,10 +8,6 @@ from subprocess import Popen, PIPE
 import sys
 import tempfile
 import unittest
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
 
 from scrapy.utils.test import get_testenv
 
diff --git a/tests/test_pipeline_media.py b/tests/test_pipeline_media.py
index 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)