From e62bbf0766568b902f99d963030e57b96cc2aae6 Mon Sep 17 00:00:00 2001
From: Mikhail Korobov <kmike84@gmail.com>
Date: Sat, 2 Aug 2014 00:24:32 +0600
Subject: [PATCH] PY3 top-level shortcuts work

---
 scrapy/__init__.py    | 12 ++++--------
 tests/py3-ignores.txt |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/scrapy/__init__.py b/scrapy/__init__.py
index a27de4bf4..10e9091b6 100644
--- a/scrapy/__init__.py
+++ b/scrapy/__init__.py
@@ -52,13 +52,9 @@ if twisted_version >= (11, 1, 0):
     optional_features.add('http11')
 
 # Declare top-level shortcuts
-if sys.version_info[0] == 2:
-    # Top-level shortcuts are not ready for Python 3 (like most of Scrapy);
-    # skip them here to make at least some parts of Scrapy
-    # importable in Python 3.
-    from scrapy.spider import Spider
-    from scrapy.http import Request, FormRequest
-    from scrapy.selector import Selector
-    from scrapy.item import Item, Field
+from scrapy.spider import Spider
+from scrapy.http import Request, FormRequest
+from scrapy.selector import Selector
+from scrapy.item import Item, Field
 
 del sys
diff --git a/tests/py3-ignores.txt b/tests/py3-ignores.txt
index cd01ef6a9..c1619b3ae 100644
--- a/tests/py3-ignores.txt
+++ b/tests/py3-ignores.txt
@@ -51,7 +51,6 @@ tests/test_spidermanager/test_spiders/spider4.py
 tests/test_spidermiddleware_httperror.py
 tests/test_spidermiddleware_referer.py
 tests/test_spider.py
-tests/test_toplevel.py
 tests/test_utils_defer.py
 tests/test_utils_iterators.py
 tests/test_utils_jsonrpc.py