From 259dccaf5840af03375ab372a68df0bbba7d233e Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Sun, 7 Aug 2011 02:49:57 -0300 Subject: [PATCH] moved module scrapy.core.downloader.responsetypes to scrapy.responsetypes --HG-- rename : scrapy/core/downloader/responsetypes/mime.types => scrapy/mime.types rename : scrapy/core/downloader/responsetypes/__init__.py => scrapy/responsetypes.py --- MANIFEST.in | 2 +- scrapy/contrib/downloadermiddleware/httpcache.py | 2 +- scrapy/contrib/downloadermiddleware/httpcompression.py | 2 +- scrapy/contrib/httpcache.py | 2 +- scrapy/contrib_exp/downloadermiddleware/decompression.py | 2 +- scrapy/core/downloader/handlers/file.py | 2 +- scrapy/core/downloader/webclient.py | 2 +- scrapy/{core/downloader/responsetypes => }/mime.types | 0 .../downloader/responsetypes/__init__.py => responsetypes.py} | 4 +--- scrapy/tests/test_responsetypes.py | 2 +- 10 files changed, 9 insertions(+), 11 deletions(-) rename scrapy/{core/downloader/responsetypes => }/mime.types (100%) rename scrapy/{core/downloader/responsetypes/__init__.py => responsetypes.py} (97%) diff --git a/MANIFEST.in b/MANIFEST.in index 3002ca360..bf6ec398c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,7 @@ include AUTHORS include INSTALL include LICENSE include MANIFEST.in -include scrapy/core/downloader/responsetypes/mime.types +include scrapy/mime.types include scrapyd/default_scrapyd.conf recursive-include scrapy/templates * recursive-include scrapy/tests/sample_data * diff --git a/scrapy/contrib/downloadermiddleware/httpcache.py b/scrapy/contrib/downloadermiddleware/httpcache.py index c10b121ed..b7c3bbd2e 100644 --- a/scrapy/contrib/downloadermiddleware/httpcache.py +++ b/scrapy/contrib/downloadermiddleware/httpcache.py @@ -11,7 +11,7 @@ from scrapy.xlib.pydispatch import dispatcher from scrapy import signals from scrapy.http import Headers from scrapy.exceptions import NotConfigured, IgnoreRequest -from scrapy.core.downloader.responsetypes import responsetypes +from scrapy.responsetypes import responsetypes from scrapy.utils.request import request_fingerprint from scrapy.utils.httpobj import urlparse_cached from scrapy.utils.misc import load_object diff --git a/scrapy/contrib/downloadermiddleware/httpcompression.py b/scrapy/contrib/downloadermiddleware/httpcompression.py index 63d20e676..25af3e051 100644 --- a/scrapy/contrib/downloadermiddleware/httpcompression.py +++ b/scrapy/contrib/downloadermiddleware/httpcompression.py @@ -2,7 +2,7 @@ import zlib from scrapy.utils.gz import gunzip from scrapy.http import Response, TextResponse -from scrapy.core.downloader.responsetypes import responsetypes +from scrapy.responsetypes import responsetypes class HttpCompressionMiddleware(object): diff --git a/scrapy/contrib/httpcache.py b/scrapy/contrib/httpcache.py index dfd43a1db..8eed8b943 100644 --- a/scrapy/contrib/httpcache.py +++ b/scrapy/contrib/httpcache.py @@ -5,7 +5,7 @@ from time import time import cPickle as pickle from scrapy.http import Headers -from scrapy.core.downloader.responsetypes import responsetypes +from scrapy.responsetypes import responsetypes from scrapy.utils.request import request_fingerprint from scrapy.utils.project import data_path from scrapy import conf diff --git a/scrapy/contrib_exp/downloadermiddleware/decompression.py b/scrapy/contrib_exp/downloadermiddleware/decompression.py index 83bc2bb97..397c9e093 100644 --- a/scrapy/contrib_exp/downloadermiddleware/decompression.py +++ b/scrapy/contrib_exp/downloadermiddleware/decompression.py @@ -11,7 +11,7 @@ from tempfile import mktemp from scrapy import log from scrapy.http import Response -from scrapy.core.downloader.responsetypes import responsetypes +from scrapy.responsetypes import responsetypes class DecompressionMiddleware(object): diff --git a/scrapy/core/downloader/handlers/file.py b/scrapy/core/downloader/handlers/file.py index d01c37c9c..a63a5ffeb 100644 --- a/scrapy/core/downloader/handlers/file.py +++ b/scrapy/core/downloader/handlers/file.py @@ -1,5 +1,5 @@ from w3lib.url import file_uri_to_path -from scrapy.core.downloader.responsetypes import responsetypes +from scrapy.responsetypes import responsetypes from scrapy.utils.decorator import defers class FileDownloadHandler(object): diff --git a/scrapy/core/downloader/webclient.py b/scrapy/core/downloader/webclient.py index f8add2ab6..a1eaa7a07 100644 --- a/scrapy/core/downloader/webclient.py +++ b/scrapy/core/downloader/webclient.py @@ -8,7 +8,7 @@ from twisted.internet import defer from scrapy.http import Headers from scrapy.utils.httpobj import urlparse_cached -from scrapy.core.downloader.responsetypes import responsetypes +from scrapy.responsetypes import responsetypes def _parsed_url_args(parsed): diff --git a/scrapy/core/downloader/responsetypes/mime.types b/scrapy/mime.types similarity index 100% rename from scrapy/core/downloader/responsetypes/mime.types rename to scrapy/mime.types diff --git a/scrapy/core/downloader/responsetypes/__init__.py b/scrapy/responsetypes.py similarity index 97% rename from scrapy/core/downloader/responsetypes/__init__.py rename to scrapy/responsetypes.py index 99ee291b6..66f3c05db 100644 --- a/scrapy/core/downloader/responsetypes/__init__.py +++ b/scrapy/responsetypes.py @@ -14,8 +14,6 @@ from scrapy.utils.python import isbinarytext from scrapy.utils.py26 import get_data from scrapy.conf import settings -__package__ = 'scrapy.core.downloader.responsetypes' # required for python 2.5 - class ResponseTypes(object): CLASSES = { @@ -36,7 +34,7 @@ class ResponseTypes(object): self.CLASSES.update(settings.get('RESPONSE_CLASSES', {})) self.classes = {} self.mimetypes = MimeTypes() - mimedata = get_data(__package__, 'mime.types') + mimedata = get_data('scrapy', 'mime.types') self.mimetypes.readfp(StringIO(mimedata)) for mimetype, cls in self.CLASSES.iteritems(): self.classes[mimetype] = load_object(cls) diff --git a/scrapy/tests/test_responsetypes.py b/scrapy/tests/test_responsetypes.py index ae74c514a..6302380f6 100644 --- a/scrapy/tests/test_responsetypes.py +++ b/scrapy/tests/test_responsetypes.py @@ -1,5 +1,5 @@ import unittest -from scrapy.core.downloader.responsetypes import responsetypes +from scrapy.responsetypes import responsetypes from scrapy.http import Response, TextResponse, XmlResponse, HtmlResponse, Headers