diff --git a/scrapy/__init__.py b/scrapy/__init__.py index 84cf85e67..f81e1b2fd 100644 --- a/scrapy/__init__.py +++ b/scrapy/__init__.py @@ -14,14 +14,6 @@ if sys.version_info < (2,5): # ignore noisy twisted deprecation warnings warnings.filterwarnings('ignore', category=DeprecationWarning, module='twisted') -# prevents noisy (and innocent) dropin.cache errors when loading spiders from -# egg files using the old Spider Manager. TODO: Remove for Scrapy 0.11 -try: - from twisted.python.zippath import ZipPath - ZipPath.setContent = lambda x, y: None -except ImportError: # to avoid making setup.py depend on Twisted - pass - # monkey patches to fix external library issues from scrapy.xlib import twisted_250_monkeypatches, urlparse_monkeypatches diff --git a/scrapy/core/exceptions.py b/scrapy/core/exceptions.py deleted file mode 100644 index b32b72774..000000000 --- a/scrapy/core/exceptions.py +++ /dev/null @@ -1,5 +0,0 @@ -from scrapy.exceptions import * - -import warnings -warnings.warn("scrapy.core.exceptions is deprecated and will be removed in Scrapy 0.11, use scrapy.exceptions instead", \ - DeprecationWarning, stacklevel=2) diff --git a/scrapy/core/manager.py b/scrapy/core/manager.py deleted file mode 100644 index 59e51495c..000000000 --- a/scrapy/core/manager.py +++ /dev/null @@ -1,6 +0,0 @@ -import warnings -warnings.warn("scrapy.core.manager.scrapymanager is deprecated and will be removed in Scrapy 0.11, use scrapy.project.crawler instead", \ - DeprecationWarning, stacklevel=2) - -from scrapy.project import crawler -scrapymanager = crawler diff --git a/scrapy/core/queue.py b/scrapy/core/queue.py deleted file mode 100644 index 0b6d10600..000000000 --- a/scrapy/core/queue.py +++ /dev/null @@ -1,5 +0,0 @@ -from scrapy.queue import * - -import warnings -warnings.warn("scrapy.core.queue is deprecated and will be removed in Scrapy 0.11, use scrapy.queue instead", \ - DeprecationWarning, stacklevel=2) diff --git a/scrapy/core/signals.py b/scrapy/core/signals.py deleted file mode 100644 index e454aca76..000000000 --- a/scrapy/core/signals.py +++ /dev/null @@ -1,7 +0,0 @@ -from scrapy.signals import * - -import warnings -warnings.warn("scrapy.core.signals is deprecated and will be removed in Scrapy 0.11, use scrapy.signals instead", \ - DeprecationWarning, stacklevel=2) - -request_uploaded = response_downloaded