Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Remove six.PY* checks

Eugenio Lacuestaeaeaa40b991b
diff --git a/conftest.py b/conftest.py
index 06d65ba1d..5e6a42977 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,4 +1,3 @@
-import six
import pytest
@@ -7,12 +6,11 @@ collect_ignore = [
"scrapy/utils/testsite.py",
]
-
-if six.PY3:
- for line in open('tests/py3-ignores.txt'):
- file_path = line.strip()
- if file_path and file_path[0] != '#':
- collect_ignore.append(file_path)
+# FIXME: fix or delete these tests
+for line in open('tests/py3-ignores.txt'):
+ file_path = line.strip()
+ if file_path and file_path[0] != '#':
+ collect_ignore.append(file_path)
@pytest.fixture()
diff --git a/tests/test_webclient.py b/tests/test_webclient.py
index 0c04e7114..608cfe597 100644
--- a/tests/test_webclient.py
+++ b/tests/test_webclient.py
@@ -78,26 +78,6 @@ class ParseUrlTestCase(unittest.TestCase):
to_bytes(x) if not isinstance(x, int) else x for x in test)
self.assertEqual(client._parse(url), test, url)
- def test_externalUnicodeInterference(self):
- """
- L{client._parse} should return C{str} for the scheme, host, and path
- elements of its return tuple, even when passed an URL which has
- previously been passed to L{urlparse} as a C{unicode} string.
- """
- if not six.PY2:
- raise unittest.SkipTest(
- "Applies only to Py2, as urls can be ONLY unicode on Py3")
- badInput = u'http://example.com/path'
- goodInput = badInput.encode('ascii')
- self._parse(badInput) # cache badInput in urlparse_cached
- scheme, netloc, host, port, path = self._parse(goodInput)
- self.assertTrue(isinstance(scheme, str))
- self.assertTrue(isinstance(netloc, str))
- self.assertTrue(isinstance(host, str))
- self.assertTrue(isinstance(path, str))
- self.assertTrue(isinstance(port, int))
-
-
class ScrapyHTTPPageGetterTests(unittest.TestCase):