Scrapy, a fast high-level web crawling & scraping framework for Python.
remove backwards compatibility shims for relocated modules
Mikhail Korobovd4c7cc848b83
diff --git a/.coveragerc b/.coveragercindex 3105409ba..aeadccb25 100644--- a/.coveragerc+++ b/.coveragerc@@ -7,13 +7,4 @@ omit =scrapy/conf.pyscrapy/stats.pyscrapy/project.py- scrapy/utils/decorator.py- scrapy/statscol.py- scrapy/squeue.pyscrapy/log.py- scrapy/dupefilter.py- scrapy/command.py- scrapy/linkextractor.py- scrapy/spider.py- scrapy/contrib/*- scrapy/contrib_exp/*diff --git a/conftest.py b/conftest.pyindex 8b4faf8fc..c733db646 100644--- a/conftest.py+++ b/conftest.py@@ -13,19 +13,12 @@ collect_ignore = ["scrapy/conf.py","scrapy/stats.py","scrapy/project.py",- "scrapy/utils/decorator.py",- "scrapy/statscol.py",- "scrapy/squeue.py","scrapy/log.py",- "scrapy/dupefilter.py",- "scrapy/command.py",- "scrapy/linkextractor.py",- "scrapy/spider.py",# not a test, but looks like a test"scrapy/utils/testsite.py",-] + _py_files("scrapy/contrib") + _py_files("scrapy/contrib_exp")+]if (twisted_version.major, twisted_version.minor, twisted_version.micro) >= (15, 5, 0):collect_ignore += _py_files("scrapy/xlib/tx")diff --git a/scrapy/command.py b/scrapy/command.pydeleted file mode 100644index 3e1219bbc..000000000--- a/scrapy/command.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.command` is deprecated, "- "use `scrapy.commands` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.commands import *diff --git a/scrapy/contrib/__init__.py b/scrapy/contrib/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/scrapy/contrib/closespider.py b/scrapy/contrib/closespider.pydeleted file mode 100644index 9c52c418f..000000000--- a/scrapy/contrib/closespider.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.closespider` is deprecated, "- "use `scrapy.extensions.closespider` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.closespider import *diff --git a/scrapy/contrib/corestats.py b/scrapy/contrib/corestats.pydeleted file mode 100644index 2f5354239..000000000--- a/scrapy/contrib/corestats.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.corestats` is deprecated, "- "use `scrapy.extensions.corestats` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.corestats import *diff --git a/scrapy/contrib/debug.py b/scrapy/contrib/debug.pydeleted file mode 100644index a38f059ce..000000000--- a/scrapy/contrib/debug.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.debug` is deprecated, "- "use `scrapy.extensions.debug` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.debug import *diff --git a/scrapy/contrib/downloadermiddleware/__init__.py b/scrapy/contrib/downloadermiddleware/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/scrapy/contrib/downloadermiddleware/ajaxcrawl.py b/scrapy/contrib/downloadermiddleware/ajaxcrawl.pydeleted file mode 100644index 90ebc46b6..000000000--- a/scrapy/contrib/downloadermiddleware/ajaxcrawl.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.ajaxcrawl` is deprecated, "- "use `scrapy.downloadermiddlewares.ajaxcrawl` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.ajaxcrawl import *diff --git a/scrapy/contrib/downloadermiddleware/chunked.py b/scrapy/contrib/downloadermiddleware/chunked.pydeleted file mode 100644index 1322c9083..000000000--- a/scrapy/contrib/downloadermiddleware/chunked.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.chunked` is deprecated, "- "use `scrapy.downloadermiddlewares.chunked` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.chunked import *diff --git a/scrapy/contrib/downloadermiddleware/cookies.py b/scrapy/contrib/downloadermiddleware/cookies.pydeleted file mode 100644index bad970690..000000000--- a/scrapy/contrib/downloadermiddleware/cookies.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.cookies` is deprecated, "- "use `scrapy.downloadermiddlewares.cookies` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.cookies import *diff --git a/scrapy/contrib/downloadermiddleware/decompression.py b/scrapy/contrib/downloadermiddleware/decompression.pydeleted file mode 100644index a541aa61e..000000000--- a/scrapy/contrib/downloadermiddleware/decompression.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.decompression` is deprecated, "- "use `scrapy.downloadermiddlewares.decompression` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.decompression import *diff --git a/scrapy/contrib/downloadermiddleware/defaultheaders.py b/scrapy/contrib/downloadermiddleware/defaultheaders.pydeleted file mode 100644index cf023dc8f..000000000--- a/scrapy/contrib/downloadermiddleware/defaultheaders.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.defaultheaders` is deprecated, "- "use `scrapy.downloadermiddlewares.defaultheaders` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.defaultheaders import *diff --git a/scrapy/contrib/downloadermiddleware/downloadtimeout.py b/scrapy/contrib/downloadermiddleware/downloadtimeout.pydeleted file mode 100644index 84bd06acf..000000000--- a/scrapy/contrib/downloadermiddleware/downloadtimeout.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.downloadtimeout` is deprecated, "- "use `scrapy.downloadermiddlewares.downloadtimeout` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.downloadtimeout import *diff --git a/scrapy/contrib/downloadermiddleware/httpauth.py b/scrapy/contrib/downloadermiddleware/httpauth.pydeleted file mode 100644index a37ffa0dc..000000000--- a/scrapy/contrib/downloadermiddleware/httpauth.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.httpauth` is deprecated, "- "use `scrapy.downloadermiddlewares.httpauth` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.httpauth import *diff --git a/scrapy/contrib/downloadermiddleware/httpcache.py b/scrapy/contrib/downloadermiddleware/httpcache.pydeleted file mode 100644index f5f068204..000000000--- a/scrapy/contrib/downloadermiddleware/httpcache.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.httpcache` is deprecated, "- "use `scrapy.downloadermiddlewares.httpcache` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.httpcache import *diff --git a/scrapy/contrib/downloadermiddleware/httpcompression.py b/scrapy/contrib/downloadermiddleware/httpcompression.pydeleted file mode 100644index 8a52ec50b..000000000--- a/scrapy/contrib/downloadermiddleware/httpcompression.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.httpcompression` is deprecated, "- "use `scrapy.downloadermiddlewares.httpcompression` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.httpcompression import *diff --git a/scrapy/contrib/downloadermiddleware/httpproxy.py b/scrapy/contrib/downloadermiddleware/httpproxy.pydeleted file mode 100644index d94d85076..000000000--- a/scrapy/contrib/downloadermiddleware/httpproxy.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.httpproxy` is deprecated, "- "use `scrapy.downloadermiddlewares.httpproxy` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.httpproxy import *diff --git a/scrapy/contrib/downloadermiddleware/redirect.py b/scrapy/contrib/downloadermiddleware/redirect.pydeleted file mode 100644index 824eee8ae..000000000--- a/scrapy/contrib/downloadermiddleware/redirect.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.redirect` is deprecated, "- "use `scrapy.downloadermiddlewares.redirect` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.redirect import *diff --git a/scrapy/contrib/downloadermiddleware/retry.py b/scrapy/contrib/downloadermiddleware/retry.pydeleted file mode 100644index aafe0f508..000000000--- a/scrapy/contrib/downloadermiddleware/retry.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.retry` is deprecated, "- "use `scrapy.downloadermiddlewares.retry` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.retry import *diff --git a/scrapy/contrib/downloadermiddleware/robotstxt.py b/scrapy/contrib/downloadermiddleware/robotstxt.pydeleted file mode 100644index 408f760a0..000000000--- a/scrapy/contrib/downloadermiddleware/robotstxt.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.robotstxt` is deprecated, "- "use `scrapy.downloadermiddlewares.robotstxt` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.robotstxt import *diff --git a/scrapy/contrib/downloadermiddleware/stats.py b/scrapy/contrib/downloadermiddleware/stats.pydeleted file mode 100644index fa84a8206..000000000--- a/scrapy/contrib/downloadermiddleware/stats.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.stats` is deprecated, "- "use `scrapy.downloadermiddlewares.stats` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.stats import *diff --git a/scrapy/contrib/downloadermiddleware/useragent.py b/scrapy/contrib/downloadermiddleware/useragent.pydeleted file mode 100644index 893d5241c..000000000--- a/scrapy/contrib/downloadermiddleware/useragent.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.downloadermiddleware.useragent` is deprecated, "- "use `scrapy.downloadermiddlewares.useragent` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.useragent import *diff --git a/scrapy/contrib/exporter/__init__.py b/scrapy/contrib/exporter/__init__.pydeleted file mode 100644index 12adaaddd..000000000--- a/scrapy/contrib/exporter/__init__.py+++ /dev/null@@ -1,8 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.exporter` is deprecated, "- "use `scrapy.exporters` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.exporters import *-from scrapy.exporters import PythonItemExporterdiff --git a/scrapy/contrib/feedexport.py b/scrapy/contrib/feedexport.pydeleted file mode 100644index 19651998a..000000000--- a/scrapy/contrib/feedexport.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.feedexport` is deprecated, "- "use `scrapy.extensions.feedexport` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.feedexport import *diff --git a/scrapy/contrib/httpcache.py b/scrapy/contrib/httpcache.pydeleted file mode 100644index 196372fcb..000000000--- a/scrapy/contrib/httpcache.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.httpcache` is deprecated, "- "use `scrapy.extensions.httpcache` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.httpcache import *diff --git a/scrapy/contrib/linkextractors/__init__.py b/scrapy/contrib/linkextractors/__init__.pydeleted file mode 100644index 976658df3..000000000--- a/scrapy/contrib/linkextractors/__init__.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.linkextractors` is deprecated, "- "use `scrapy.linkextractors` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.linkextractors import *diff --git a/scrapy/contrib/linkextractors/htmlparser.py b/scrapy/contrib/linkextractors/htmlparser.pydeleted file mode 100644index ff03da98f..000000000--- a/scrapy/contrib/linkextractors/htmlparser.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.linkextractors.htmlparser` is deprecated, "- "use `scrapy.linkextractors.htmlparser` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.linkextractors.htmlparser import *diff --git a/scrapy/contrib/linkextractors/lxmlhtml.py b/scrapy/contrib/linkextractors/lxmlhtml.pydeleted file mode 100644index fc2b7de3c..000000000--- a/scrapy/contrib/linkextractors/lxmlhtml.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.linkextractors.lxmlhtml` is deprecated, "- "use `scrapy.linkextractors.lxmlhtml` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.linkextractors.lxmlhtml import *diff --git a/scrapy/contrib/linkextractors/regex.py b/scrapy/contrib/linkextractors/regex.pydeleted file mode 100644index 97bda29c1..000000000--- a/scrapy/contrib/linkextractors/regex.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.linkextractors.regex` is deprecated, "- "use `scrapy.linkextractors.regex` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.linkextractors.regex import *diff --git a/scrapy/contrib/linkextractors/sgml.py b/scrapy/contrib/linkextractors/sgml.pydeleted file mode 100644index a5a598208..000000000--- a/scrapy/contrib/linkextractors/sgml.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.linkextractors.sgml` is deprecated, "- "use `scrapy.linkextractors.sgml` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.linkextractors.sgml import *diff --git a/scrapy/contrib/loader/__init__.py b/scrapy/contrib/loader/__init__.pydeleted file mode 100644index 2b9453e18..000000000--- a/scrapy/contrib/loader/__init__.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.loader` is deprecated, "- "use `scrapy.loader` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.loader import *diff --git a/scrapy/contrib/loader/common.py b/scrapy/contrib/loader/common.pydeleted file mode 100644index a59b2b7b1..000000000--- a/scrapy/contrib/loader/common.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.loader.common` is deprecated, "- "use `scrapy.loader.common` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.loader.common import *diff --git a/scrapy/contrib/loader/processor.py b/scrapy/contrib/loader/processor.pydeleted file mode 100644index da7e484a5..000000000--- a/scrapy/contrib/loader/processor.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.loader.processor` is deprecated, "- "use `scrapy.loader.processors` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.loader.processors import *diff --git a/scrapy/contrib/logstats.py b/scrapy/contrib/logstats.pydeleted file mode 100644index 62bc9b860..000000000--- a/scrapy/contrib/logstats.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.logstats` is deprecated, "- "use `scrapy.extensions.logstats` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.logstats import *diff --git a/scrapy/contrib/memdebug.py b/scrapy/contrib/memdebug.pydeleted file mode 100644index 4f6e4760e..000000000--- a/scrapy/contrib/memdebug.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.memdebug` is deprecated, "- "use `scrapy.extensions.memdebug` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.memdebug import *diff --git a/scrapy/contrib/memusage.py b/scrapy/contrib/memusage.pydeleted file mode 100644index e13bd78f3..000000000--- a/scrapy/contrib/memusage.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.memusage` is deprecated, "- "use `scrapy.extensions.memusage` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.memusage import *diff --git a/scrapy/contrib/pipeline/__init__.py b/scrapy/contrib/pipeline/__init__.pydeleted file mode 100644index aedf34a3f..000000000--- a/scrapy/contrib/pipeline/__init__.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.pipeline` is deprecated, "- "use `scrapy.pipelines` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.pipelines import *diff --git a/scrapy/contrib/pipeline/files.py b/scrapy/contrib/pipeline/files.pydeleted file mode 100644index cd1238b5d..000000000--- a/scrapy/contrib/pipeline/files.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.pipeline.files` is deprecated, "- "use `scrapy.pipelines.files` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.pipelines.files import *diff --git a/scrapy/contrib/pipeline/images.py b/scrapy/contrib/pipeline/images.pydeleted file mode 100644index 4f5ce4c40..000000000--- a/scrapy/contrib/pipeline/images.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.pipeline.images` is deprecated, "- "use `scrapy.pipelines.images` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.pipelines.images import *diff --git a/scrapy/contrib/pipeline/media.py b/scrapy/contrib/pipeline/media.pydeleted file mode 100644index 4b4fea560..000000000--- a/scrapy/contrib/pipeline/media.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.pipeline.media` is deprecated, "- "use `scrapy.pipelines.media` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.pipelines.media import *diff --git a/scrapy/contrib/spidermiddleware/__init__.py b/scrapy/contrib/spidermiddleware/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/scrapy/contrib/spidermiddleware/depth.py b/scrapy/contrib/spidermiddleware/depth.pydeleted file mode 100644index 718803148..000000000--- a/scrapy/contrib/spidermiddleware/depth.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spidermiddleware.depth` is deprecated, "- "use `scrapy.spidermiddlewares.depth` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spidermiddlewares.depth import *diff --git a/scrapy/contrib/spidermiddleware/httperror.py b/scrapy/contrib/spidermiddleware/httperror.pydeleted file mode 100644index e39fb3f56..000000000--- a/scrapy/contrib/spidermiddleware/httperror.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spidermiddleware.httperror` is deprecated, "- "use `scrapy.spidermiddlewares.httperror` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spidermiddlewares.httperror import *diff --git a/scrapy/contrib/spidermiddleware/offsite.py b/scrapy/contrib/spidermiddleware/offsite.pydeleted file mode 100644index a5ed9ea7e..000000000--- a/scrapy/contrib/spidermiddleware/offsite.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spidermiddleware.offsite` is deprecated, "- "use `scrapy.spidermiddlewares.offsite` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spidermiddlewares.offsite import *diff --git a/scrapy/contrib/spidermiddleware/referer.py b/scrapy/contrib/spidermiddleware/referer.pydeleted file mode 100644index fdf8d6659..000000000--- a/scrapy/contrib/spidermiddleware/referer.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spidermiddleware.referer` is deprecated, "- "use `scrapy.spidermiddlewares.referer` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spidermiddlewares.referer import *diff --git a/scrapy/contrib/spidermiddleware/urllength.py b/scrapy/contrib/spidermiddleware/urllength.pydeleted file mode 100644index 5e51add59..000000000--- a/scrapy/contrib/spidermiddleware/urllength.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spidermiddleware.urllength` is deprecated, "- "use `scrapy.spidermiddlewares.urllength` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spidermiddlewares.urllength import *diff --git a/scrapy/contrib/spiders/__init__.py b/scrapy/contrib/spiders/__init__.pydeleted file mode 100644index 56780533b..000000000--- a/scrapy/contrib/spiders/__init__.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spiders` is deprecated, "- "use `scrapy.spiders` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spiders import *diff --git a/scrapy/contrib/spiders/crawl.py b/scrapy/contrib/spiders/crawl.pydeleted file mode 100644index d20a8bb16..000000000--- a/scrapy/contrib/spiders/crawl.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spiders.crawl` is deprecated, "- "use `scrapy.spiders.crawl` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spiders.crawl import *diff --git a/scrapy/contrib/spiders/feed.py b/scrapy/contrib/spiders/feed.pydeleted file mode 100644index 5eea9a062..000000000--- a/scrapy/contrib/spiders/feed.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spiders.feed` is deprecated, "- "use `scrapy.spiders.feed` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spiders.feed import *diff --git a/scrapy/contrib/spiders/init.py b/scrapy/contrib/spiders/init.pydeleted file mode 100644index 6d1ec0aa9..000000000--- a/scrapy/contrib/spiders/init.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spiders.init` is deprecated, "- "use `scrapy.spiders.init` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spiders.init import *diff --git a/scrapy/contrib/spiders/sitemap.py b/scrapy/contrib/spiders/sitemap.pydeleted file mode 100644index 2ad231fd8..000000000--- a/scrapy/contrib/spiders/sitemap.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spiders.sitemap` is deprecated, "- "use `scrapy.spiders.sitemap` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spiders.sitemap import *diff --git a/scrapy/contrib/spiderstate.py b/scrapy/contrib/spiderstate.pydeleted file mode 100644index 06afc8bfc..000000000--- a/scrapy/contrib/spiderstate.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.spiderstate` is deprecated, "- "use `scrapy.extensions.spiderstate` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.spiderstate import *diff --git a/scrapy/contrib/statsmailer.py b/scrapy/contrib/statsmailer.pydeleted file mode 100644index f9c9a37f5..000000000--- a/scrapy/contrib/statsmailer.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.statsmailer` is deprecated, "- "use `scrapy.extensions.statsmailer` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.statsmailer import *diff --git a/scrapy/contrib/throttle.py b/scrapy/contrib/throttle.pydeleted file mode 100644index d5c234871..000000000--- a/scrapy/contrib/throttle.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib.throttle` is deprecated, "- "use `scrapy.extensions.throttle` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.extensions.throttle import *diff --git a/scrapy/contrib_exp/__init__.py b/scrapy/contrib_exp/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/scrapy/contrib_exp/downloadermiddleware/__init__.py b/scrapy/contrib_exp/downloadermiddleware/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/scrapy/contrib_exp/downloadermiddleware/decompression.py b/scrapy/contrib_exp/downloadermiddleware/decompression.pydeleted file mode 100644index 1f8490587..000000000--- a/scrapy/contrib_exp/downloadermiddleware/decompression.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib_exp.downloadermiddleware.decompression` is deprecated, "- "use `scrapy.downloadermiddlewares.decompression` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.downloadermiddlewares.decompression import DecompressionMiddlewarediff --git a/scrapy/contrib_exp/iterators.py b/scrapy/contrib_exp/iterators.pydeleted file mode 100644index c59f47bcc..000000000--- a/scrapy/contrib_exp/iterators.py+++ /dev/null@@ -1,6 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.contrib_exp.iterators` is deprecated, use `scrapy.utils.iterators` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.utils.iterators import xmliter_lxmldiff --git a/scrapy/dupefilter.py b/scrapy/dupefilter.pydeleted file mode 100644index 232d96288..000000000--- a/scrapy/dupefilter.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.dupefilter` is deprecated, "- "use `scrapy.dupefilters` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.dupefilters import *diff --git a/scrapy/linkextractor.py b/scrapy/linkextractor.pydeleted file mode 100644index b744aff8e..000000000--- a/scrapy/linkextractor.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.linkextractor` is deprecated, "- "use `scrapy.linkextractors` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.linkextractors import *diff --git a/scrapy/spider.py b/scrapy/spider.pydeleted file mode 100644index 56a5a0a0b..000000000--- a/scrapy/spider.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.spider` is deprecated, "- "use `scrapy.spiders` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.spiders import *diff --git a/scrapy/squeue.py b/scrapy/squeue.pydeleted file mode 100644index a4a3f4238..000000000--- a/scrapy/squeue.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.squeue` is deprecated, "- "use `scrapy.squeues` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.squeues import *diff --git a/scrapy/statscol.py b/scrapy/statscol.pydeleted file mode 100644index b4ddcce28..000000000--- a/scrapy/statscol.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.statscol` is deprecated, "- "use `scrapy.statscollectors` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.statscollectors import *diff --git a/scrapy/utils/decorator.py b/scrapy/utils/decorator.pydeleted file mode 100644index e8c8eae39..000000000--- a/scrapy/utils/decorator.py+++ /dev/null@@ -1,7 +0,0 @@-import warnings-from scrapy.exceptions import ScrapyDeprecationWarning-warnings.warn("Module `scrapy.utils.decorator` is deprecated, "- "use `scrapy.utils.decorators` instead",- ScrapyDeprecationWarning, stacklevel=2)--from scrapy.utils.decorators import *diff --git a/scrapy/utils/deprecate.py b/scrapy/utils/deprecate.pyindex f76161a68..8c72cc556 100644--- a/scrapy/utils/deprecate.py+++ b/scrapy/utils/deprecate.py@@ -124,25 +124,7 @@ def _clspath(cls, forced=None):DEPRECATION_RULES = [- ('scrapy.contrib_exp.downloadermiddleware.decompression.', 'scrapy.downloadermiddlewares.decompression.'),- ('scrapy.contrib_exp.iterators.', 'scrapy.utils.iterators.'),- ('scrapy.contrib.downloadermiddleware.', 'scrapy.downloadermiddlewares.'),- ('scrapy.contrib.exporter.', 'scrapy.exporters.'),- ('scrapy.contrib.linkextractors.', 'scrapy.linkextractors.'),- ('scrapy.contrib.loader.processor.', 'scrapy.loader.processors.'),- ('scrapy.contrib.loader.', 'scrapy.loader.'),- ('scrapy.contrib.pipeline.', 'scrapy.pipelines.'),- ('scrapy.contrib.spidermiddleware.', 'scrapy.spidermiddlewares.'),- ('scrapy.contrib.spiders.', 'scrapy.spiders.'),- ('scrapy.contrib.', 'scrapy.extensions.'),- ('scrapy.command.', 'scrapy.commands.'),- ('scrapy.dupefilter.', 'scrapy.dupefilters.'),- ('scrapy.linkextractor.', 'scrapy.linkextractors.'),('scrapy.telnet.', 'scrapy.extensions.telnet.'),- ('scrapy.spider.', 'scrapy.spiders.'),- ('scrapy.squeue.', 'scrapy.squeues.'),- ('scrapy.statscol.', 'scrapy.statscollectors.'),- ('scrapy.utils.decorator.', 'scrapy.utils.decorators.'),('scrapy.spidermanager.SpiderManager', 'scrapy.spiderloader.SpiderLoader'),]