From 7466150286cad0d056adeea61e251dcacc0e2093 Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Fri, 4 Sep 2009 17:32:34 -0300 Subject: [PATCH] removed some more obsolete middlewares --- scrapy/conf/default_settings.py | 2 +- scrapy/contrib/downloadermiddleware/cache.py | 14 -------------- scrapy/contrib/downloadermiddleware/common.py | 10 ---------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 scrapy/contrib/downloadermiddleware/cache.py delete mode 100644 scrapy/contrib/downloadermiddleware/common.py diff --git a/scrapy/conf/default_settings.py b/scrapy/conf/default_settings.py index cb0616de6..ad82f34fc 100644 --- a/scrapy/conf/default_settings.py +++ b/scrapy/conf/default_settings.py @@ -62,7 +62,7 @@ DOWNLOADER_MIDDLEWARES_BASE = { 'scrapy.contrib.downloadermiddleware.cookies.CookiesMiddleware': 700, 'scrapy.contrib.downloadermiddleware.httpcompression.HttpCompressionMiddleware': 800, 'scrapy.contrib.downloadermiddleware.stats.DownloaderStats': 850, - 'scrapy.contrib.downloadermiddleware.cache.HttpCacheMiddleware': 900, + 'scrapy.contrib.downloadermiddleware.httpcache.HttpCacheMiddleware': 900, # Downloader side } diff --git a/scrapy/contrib/downloadermiddleware/cache.py b/scrapy/contrib/downloadermiddleware/cache.py deleted file mode 100644 index f848afcd1..000000000 --- a/scrapy/contrib/downloadermiddleware/cache.py +++ /dev/null @@ -1,14 +0,0 @@ -# FIXME: code below is for backwards compatibility and should be removed before -# the 0.7 release - -import warnings - -from scrapy.contrib.downloadermiddleware.httpcache import HttpCacheMiddleware - -class CacheMiddleware(HttpCacheMiddleware): - - def __init__(self, *args, **kwargs): - warnings.warn("scrapy.contrib.downloadermiddleware.cache.CacheMiddleware was moved to scrapy.contrib.downloadermiddleware.httpcache.HttpCacheMiddleware", - DeprecationWarning, stacklevel=2) - HttpCacheMiddleware.__init__(self, *args, **kwargs) - diff --git a/scrapy/contrib/downloadermiddleware/common.py b/scrapy/contrib/downloadermiddleware/common.py deleted file mode 100644 index 273ec7995..000000000 --- a/scrapy/contrib/downloadermiddleware/common.py +++ /dev/null @@ -1,10 +0,0 @@ - -import warnings - -from scrapy.contrib.downloadermiddleware.defaultheaders import DefaultHeadersMiddleware - -class CommonMiddleware(DefaultHeadersMiddleware): - - def __init__(self): - warnings.warn("scrapy.contrib.downloadermiddleware.common.CommonMiddleware has been replaced by scrapy.contrib.downloadermiddleware.defaultheaders.DefaultHeadersMiddleware") - DefaultHeadersMiddleware.__init__(self)