From 4f54ca3294600893ed5da242d07fa4d285da5adf Mon Sep 17 00:00:00 2001 From: Julia Medina Date: Thu, 19 Mar 2015 13:24:51 -0300 Subject: [PATCH] Change 'scrapy' logger for '__name__' on every module --- scrapy/commands/parse.py | 2 +- scrapy/contrib/debug.py | 2 +- scrapy/contrib/downloadermiddleware/ajaxcrawl.py | 2 +- scrapy/contrib/downloadermiddleware/cookies.py | 2 +- scrapy/contrib/downloadermiddleware/decompression.py | 2 +- scrapy/contrib/downloadermiddleware/redirect.py | 2 +- scrapy/contrib/downloadermiddleware/retry.py | 2 +- scrapy/contrib/downloadermiddleware/robotstxt.py | 2 +- scrapy/contrib/feedexport.py | 2 +- scrapy/contrib/logstats.py | 2 +- scrapy/contrib/memusage.py | 2 +- scrapy/contrib/pipeline/files.py | 2 +- scrapy/contrib/pipeline/media.py | 2 +- scrapy/contrib/spidermiddleware/depth.py | 2 +- scrapy/contrib/spidermiddleware/httperror.py | 2 +- scrapy/contrib/spidermiddleware/offsite.py | 2 +- scrapy/contrib/spidermiddleware/urllength.py | 2 +- scrapy/contrib/spiders/sitemap.py | 2 +- scrapy/contrib/throttle.py | 2 +- scrapy/core/downloader/handlers/http11.py | 2 +- scrapy/core/engine.py | 2 +- scrapy/core/scheduler.py | 2 +- scrapy/core/scraper.py | 2 +- scrapy/crawler.py | 2 +- scrapy/dupefilter.py | 2 +- scrapy/log.py | 2 +- scrapy/mail.py | 2 +- scrapy/middleware.py | 2 +- scrapy/statscol.py | 2 +- scrapy/telnet.py | 2 +- scrapy/utils/iterators.py | 2 +- scrapy/utils/log.py | 2 +- scrapy/utils/signal.py | 2 +- scrapy/utils/spider.py | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/scrapy/commands/parse.py b/scrapy/commands/parse.py index b28beecc0..245b3fdf0 100644 --- a/scrapy/commands/parse.py +++ b/scrapy/commands/parse.py @@ -11,7 +11,7 @@ from scrapy.utils.conf import arglist_to_dict from scrapy.utils.spider import iterate_spider_output, spidercls_for_request from scrapy.exceptions import UsageError -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class Command(ScrapyCommand): diff --git a/scrapy/contrib/debug.py b/scrapy/contrib/debug.py index f1ec67530..625e13249 100644 --- a/scrapy/contrib/debug.py +++ b/scrapy/contrib/debug.py @@ -14,7 +14,7 @@ from pdb import Pdb from scrapy.utils.engine import format_engine_status from scrapy.utils.trackref import format_live_refs -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class StackTraceDump(object): diff --git a/scrapy/contrib/downloadermiddleware/ajaxcrawl.py b/scrapy/contrib/downloadermiddleware/ajaxcrawl.py index ef7f34ef9..6b543b823 100644 --- a/scrapy/contrib/downloadermiddleware/ajaxcrawl.py +++ b/scrapy/contrib/downloadermiddleware/ajaxcrawl.py @@ -11,7 +11,7 @@ from scrapy.http import HtmlResponse from scrapy.utils.response import _noscript_re, _script_re -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class AjaxCrawlMiddleware(object): diff --git a/scrapy/contrib/downloadermiddleware/cookies.py b/scrapy/contrib/downloadermiddleware/cookies.py index 70ecc2dec..270d621cd 100644 --- a/scrapy/contrib/downloadermiddleware/cookies.py +++ b/scrapy/contrib/downloadermiddleware/cookies.py @@ -7,7 +7,7 @@ from scrapy.exceptions import NotConfigured from scrapy.http import Response from scrapy.http.cookies import CookieJar -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class CookiesMiddleware(object): diff --git a/scrapy/contrib/downloadermiddleware/decompression.py b/scrapy/contrib/downloadermiddleware/decompression.py index 7cd506dd9..49313cc04 100644 --- a/scrapy/contrib/downloadermiddleware/decompression.py +++ b/scrapy/contrib/downloadermiddleware/decompression.py @@ -18,7 +18,7 @@ except ImportError: from scrapy.responsetypes import responsetypes -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class DecompressionMiddleware(object): diff --git a/scrapy/contrib/downloadermiddleware/redirect.py b/scrapy/contrib/downloadermiddleware/redirect.py index 68d139bc7..f439f43ae 100644 --- a/scrapy/contrib/downloadermiddleware/redirect.py +++ b/scrapy/contrib/downloadermiddleware/redirect.py @@ -5,7 +5,7 @@ from scrapy.http import HtmlResponse from scrapy.utils.response import get_meta_refresh from scrapy.exceptions import IgnoreRequest, NotConfigured -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class BaseRedirectMiddleware(object): diff --git a/scrapy/contrib/downloadermiddleware/retry.py b/scrapy/contrib/downloadermiddleware/retry.py index 749b334f1..714103ba0 100644 --- a/scrapy/contrib/downloadermiddleware/retry.py +++ b/scrapy/contrib/downloadermiddleware/retry.py @@ -28,7 +28,7 @@ from scrapy.exceptions import NotConfigured from scrapy.utils.response import response_status_message from scrapy.xlib.tx import ResponseFailed -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class RetryMiddleware(object): diff --git a/scrapy/contrib/downloadermiddleware/robotstxt.py b/scrapy/contrib/downloadermiddleware/robotstxt.py index 12ab2dd07..9083482f0 100644 --- a/scrapy/contrib/downloadermiddleware/robotstxt.py +++ b/scrapy/contrib/downloadermiddleware/robotstxt.py @@ -12,7 +12,7 @@ from scrapy.exceptions import NotConfigured, IgnoreRequest from scrapy.http import Request from scrapy.utils.httpobj import urlparse_cached -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class RobotsTxtMiddleware(object): diff --git a/scrapy/contrib/feedexport.py b/scrapy/contrib/feedexport.py index 7162fbc10..7c6849a73 100644 --- a/scrapy/contrib/feedexport.py +++ b/scrapy/contrib/feedexport.py @@ -23,7 +23,7 @@ from scrapy.exceptions import NotConfigured from scrapy.utils.misc import load_object from scrapy.utils.python import get_func_args -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class IFeedStorage(Interface): diff --git a/scrapy/contrib/logstats.py b/scrapy/contrib/logstats.py index 3ea347e8d..647e50f8d 100644 --- a/scrapy/contrib/logstats.py +++ b/scrapy/contrib/logstats.py @@ -5,7 +5,7 @@ from twisted.internet import task from scrapy.exceptions import NotConfigured from scrapy import signals -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class LogStats(object): diff --git a/scrapy/contrib/memusage.py b/scrapy/contrib/memusage.py index d1e13bfe5..402c78b68 100644 --- a/scrapy/contrib/memusage.py +++ b/scrapy/contrib/memusage.py @@ -16,7 +16,7 @@ from scrapy.exceptions import NotConfigured from scrapy.mail import MailSender from scrapy.utils.engine import get_engine_status -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class MemoryUsage(object): diff --git a/scrapy/contrib/pipeline/files.py b/scrapy/contrib/pipeline/files.py index daedac3f7..4809005d1 100644 --- a/scrapy/contrib/pipeline/files.py +++ b/scrapy/contrib/pipeline/files.py @@ -26,7 +26,7 @@ from scrapy.exceptions import NotConfigured, IgnoreRequest from scrapy.http import Request from scrapy.utils.misc import md5sum -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class FileException(Exception): diff --git a/scrapy/contrib/pipeline/media.py b/scrapy/contrib/pipeline/media.py index 2995dded6..55ef05ad4 100644 --- a/scrapy/contrib/pipeline/media.py +++ b/scrapy/contrib/pipeline/media.py @@ -9,7 +9,7 @@ from scrapy.utils.defer import mustbe_deferred, defer_result from scrapy.utils.request import request_fingerprint from scrapy.utils.misc import arg_to_iter -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class MediaPipeline(object): diff --git a/scrapy/contrib/spidermiddleware/depth.py b/scrapy/contrib/spidermiddleware/depth.py index 6aeb5e053..795b60eb4 100644 --- a/scrapy/contrib/spidermiddleware/depth.py +++ b/scrapy/contrib/spidermiddleware/depth.py @@ -8,7 +8,7 @@ import logging from scrapy.http import Request -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class DepthMiddleware(object): diff --git a/scrapy/contrib/spidermiddleware/httperror.py b/scrapy/contrib/spidermiddleware/httperror.py index 1962eaf6c..6b7c50fce 100644 --- a/scrapy/contrib/spidermiddleware/httperror.py +++ b/scrapy/contrib/spidermiddleware/httperror.py @@ -7,7 +7,7 @@ import logging from scrapy.exceptions import IgnoreRequest -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class HttpError(IgnoreRequest): diff --git a/scrapy/contrib/spidermiddleware/offsite.py b/scrapy/contrib/spidermiddleware/offsite.py index fb69a4631..a90f9f1e0 100644 --- a/scrapy/contrib/spidermiddleware/offsite.py +++ b/scrapy/contrib/spidermiddleware/offsite.py @@ -11,7 +11,7 @@ from scrapy import signals from scrapy.http import Request from scrapy.utils.httpobj import urlparse_cached -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class OffsiteMiddleware(object): diff --git a/scrapy/contrib/spidermiddleware/urllength.py b/scrapy/contrib/spidermiddleware/urllength.py index d3c716063..a904635d8 100644 --- a/scrapy/contrib/spidermiddleware/urllength.py +++ b/scrapy/contrib/spidermiddleware/urllength.py @@ -9,7 +9,7 @@ import logging from scrapy.http import Request from scrapy.exceptions import NotConfigured -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class UrlLengthMiddleware(object): diff --git a/scrapy/contrib/spiders/sitemap.py b/scrapy/contrib/spiders/sitemap.py index 845e2bc18..90fb9fb4e 100644 --- a/scrapy/contrib/spiders/sitemap.py +++ b/scrapy/contrib/spiders/sitemap.py @@ -6,7 +6,7 @@ from scrapy.http import Request, XmlResponse from scrapy.utils.sitemap import Sitemap, sitemap_urls_from_robots from scrapy.utils.gz import gunzip, is_gzipped -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class SitemapSpider(Spider): diff --git a/scrapy/contrib/throttle.py b/scrapy/contrib/throttle.py index 5f72c81fc..a60b0cd83 100644 --- a/scrapy/contrib/throttle.py +++ b/scrapy/contrib/throttle.py @@ -3,7 +3,7 @@ import logging from scrapy.exceptions import NotConfigured from scrapy import signals -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class AutoThrottle(object): diff --git a/scrapy/core/downloader/handlers/http11.py b/scrapy/core/downloader/handlers/http11.py index 11fbd35b9..31412a0f4 100644 --- a/scrapy/core/downloader/handlers/http11.py +++ b/scrapy/core/downloader/handlers/http11.py @@ -21,7 +21,7 @@ from scrapy.core.downloader.webclient import _parse from scrapy.utils.misc import load_object from scrapy import twisted_version -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class HTTP11DownloadHandler(object): diff --git a/scrapy/core/engine.py b/scrapy/core/engine.py index a978d3c08..e912af846 100644 --- a/scrapy/core/engine.py +++ b/scrapy/core/engine.py @@ -17,7 +17,7 @@ from scrapy.http import Response, Request from scrapy.utils.misc import load_object from scrapy.utils.reactor import CallLaterOnce -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class Slot(object): diff --git a/scrapy/core/scheduler.py b/scrapy/core/scheduler.py index 0e1acacea..f199711ab 100644 --- a/scrapy/core/scheduler.py +++ b/scrapy/core/scheduler.py @@ -8,7 +8,7 @@ from scrapy.utils.reqser import request_to_dict, request_from_dict from scrapy.utils.misc import load_object from scrapy.utils.job import job_dir -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class Scheduler(object): diff --git a/scrapy/core/scraper.py b/scrapy/core/scraper.py index 196f5392d..e00be12e9 100644 --- a/scrapy/core/scraper.py +++ b/scrapy/core/scraper.py @@ -16,7 +16,7 @@ from scrapy.http import Request, Response from scrapy.item import BaseItem from scrapy.core.spidermw import SpiderMiddlewareManager -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class Slot(object): diff --git a/scrapy/crawler.py b/scrapy/crawler.py index 4eba6f83a..932fbd168 100644 --- a/scrapy/crawler.py +++ b/scrapy/crawler.py @@ -18,7 +18,7 @@ from scrapy.utils.misc import load_object from scrapy.utils.log import LogCounterHandler, configure_logging, log_scrapy_info from scrapy import signals -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class Crawler(object): diff --git a/scrapy/dupefilter.py b/scrapy/dupefilter.py index 37376ad8a..739ba922f 100644 --- a/scrapy/dupefilter.py +++ b/scrapy/dupefilter.py @@ -33,7 +33,7 @@ class RFPDupeFilter(BaseDupeFilter): self.fingerprints = set() self.logdupes = True self.debug = debug - self.logger = logging.getLogger('scrapy') + self.logger = logging.getLogger(__name__) if path: self.file = open(os.path.join(path, 'requests.seen'), 'a+') self.fingerprints.update(x.rstrip() for x in self.file) diff --git a/scrapy/log.py b/scrapy/log.py index af0473d46..6f8b5ead2 100644 --- a/scrapy/log.py +++ b/scrapy/log.py @@ -9,7 +9,7 @@ from twisted.python.failure import Failure from scrapy.exceptions import ScrapyDeprecationWarning -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) warnings.warn("Module `scrapy.log` has been deprecated, Scrapy now relies on " "the builtin Python library for logging. Read the updated " diff --git a/scrapy/mail.py b/scrapy/mail.py index 7e38663cf..2b4c57980 100644 --- a/scrapy/mail.py +++ b/scrapy/mail.py @@ -22,7 +22,7 @@ else: from twisted.internet import defer, reactor, ssl from twisted.mail.smtp import ESMTPSenderFactory -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class MailSender(object): diff --git a/scrapy/middleware.py b/scrapy/middleware.py index 917717de5..a7adc39e3 100644 --- a/scrapy/middleware.py +++ b/scrapy/middleware.py @@ -5,7 +5,7 @@ from scrapy.exceptions import NotConfigured from scrapy.utils.misc import load_object from scrapy.utils.defer import process_parallel, process_chain, process_chain_both -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class MiddlewareManager(object): diff --git a/scrapy/statscol.py b/scrapy/statscol.py index 3fe32ee81..62b037f36 100644 --- a/scrapy/statscol.py +++ b/scrapy/statscol.py @@ -4,7 +4,7 @@ Scrapy extension for collecting scraping stats import pprint import logging -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class StatsCollector(object): diff --git a/scrapy/telnet.py b/scrapy/telnet.py index 049ab32ed..d9add1d97 100644 --- a/scrapy/telnet.py +++ b/scrapy/telnet.py @@ -27,7 +27,7 @@ try: except ImportError: hpy = None -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) # signal to update telnet variables # args: telnet_vars diff --git a/scrapy/utils/iterators.py b/scrapy/utils/iterators.py index 4f81b2d9c..58ddf6215 100644 --- a/scrapy/utils/iterators.py +++ b/scrapy/utils/iterators.py @@ -13,7 +13,7 @@ from scrapy.http import TextResponse, Response from scrapy.selector import Selector from scrapy.utils.python import re_rsearch, str_to_unicode -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) def xmliter(obj, nodename): diff --git a/scrapy/utils/log.py b/scrapy/utils/log.py index e2b1edcf7..ccfeb12e1 100644 --- a/scrapy/utils/log.py +++ b/scrapy/utils/log.py @@ -11,7 +11,7 @@ from twisted.python import log as twisted_log import scrapy from scrapy.settings import overridden_settings -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) class FailureFormatter(logging.Filter): diff --git a/scrapy/utils/signal.py b/scrapy/utils/signal.py index 091955b73..cab172e4c 100644 --- a/scrapy/utils/signal.py +++ b/scrapy/utils/signal.py @@ -9,7 +9,7 @@ from scrapy.xlib.pydispatch.dispatcher import Any, Anonymous, liveReceivers, \ getAllReceivers, disconnect from scrapy.xlib.pydispatch.robustapply import robustApply -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) def send_catch_log(signal=Any, sender=Anonymous, *arguments, **named): diff --git a/scrapy/utils/spider.py b/scrapy/utils/spider.py index 1df5e3769..7ed2d0c3b 100644 --- a/scrapy/utils/spider.py +++ b/scrapy/utils/spider.py @@ -6,7 +6,7 @@ import six from scrapy.spider import Spider from scrapy.utils.misc import arg_to_iter -logger = logging.getLogger('scrapy') +logger = logging.getLogger(__name__) def iterate_spider_output(result):