moved scrapy.core.log module to scrapy.log

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40273

scrapy/trunk/scrapy/command/cmdline.py

@@ -5,7 +5,7 @@ import os
 import optparse
 
 import scrapy
-from scrapy.core import log
+from scrapy import log
 from scrapy.spider import spiders
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/contrib/closedomain.py

@@ -8,7 +8,8 @@ import pprint
 
 from pydispatch import dispatcher
 
-from scrapy.core import signals, log
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.engine import scrapyengine
 from scrapy.core.exceptions import NotConfigured
 from scrapy.mail import MailSender

scrapy/trunk/scrapy/contrib/downloadermiddleware/cache.py

@@ -9,7 +9,8 @@ import cPickle as pickle
 from pydispatch import dispatcher
 from twisted.internet import defer
 
-from scrapy.core import signals, log
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.engine import scrapyengine
 from scrapy.http import Response, Headers
 from scrapy.http.headers import headers_dict_to_raw

scrapy/trunk/scrapy/contrib/downloadermiddleware/debug.py

@@ -1,4 +1,4 @@
-from scrapy.core import log
+from scrapy import log
 from scrapy.conf import settings
 
 class CrawlDebug(object):

scrapy/trunk/scrapy/contrib/downloadermiddleware/redirect.py

@@ -1,6 +1,6 @@
 import re
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.http import Request, Response
 from scrapy.core.exceptions import HttpException
 from scrapy.utils.url import urljoin_rfc as urljoin

scrapy/trunk/scrapy/contrib/downloadermiddleware/retry.py

@@ -27,7 +27,7 @@ from twisted.internet.error import TimeoutError as ServerTimeoutError, DNSLookup
                                    ConnectionRefusedError, ConnectionDone, ConnectError
 from twisted.internet.defer import TimeoutError as UserTimeoutError 
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.exceptions import HttpException
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/contrib/downloadermiddleware/robots.py

@@ -15,7 +15,8 @@ import robotparser
 
 from pydispatch import dispatcher
 
-from scrapy.core import log, signals
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.exceptions import IgnoreRequest
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/contrib/history/middleware.py

@@ -4,7 +4,8 @@ from datetime import datetime
 from pydispatch import dispatcher
 
 from scrapy.utils.misc import load_class
-from scrapy.core import log, signals
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.exceptions import NotConfigured, IgnoreRequest
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/contrib/history/scheduler.py

@@ -2,7 +2,7 @@ from datetime import datetime
 
 from twisted.internet import defer
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.scheduler import Scheduler
 from scrapy.core.exceptions import IgnoreRequest
 

scrapy/trunk/scrapy/contrib/history/store.py

@@ -4,7 +4,7 @@ SQLHistoryStore
 Persistent history storage using relational database
 """
 from scrapy.contrib.history.history import URLHistory
-from scrapy.core import log
+from scrapy import log
 from scrapy.conf import settings
 
 class SQLHistoryStore(object) :

scrapy/trunk/scrapy/contrib/memusage.py

@@ -5,7 +5,8 @@ import socket
 
 from pydispatch import dispatcher
 
-from scrapy.core import log, signals
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.manager import scrapymanager
 from scrapy.core.engine import scrapyengine
 from scrapy.core.exceptions import NotConfigured

scrapy/trunk/scrapy/contrib/pbcluster/crawler/manager.py

@@ -4,7 +4,7 @@ from twisted.spread import pb
 from twisted.internet import reactor
 
 from scrapy.conf import settings
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.manager import scrapymanager
 from scrapy.core.exceptions import NotConfigured
 
@@ -35,4 +35,4 @@ class ClusterCrawler:
         def _set_worker(obj):
             self.worker = Broker(self, obj)
         d.addCallbacks(callback=_set_worker, errback=lambda reason: log.msg(reason, log.ERROR))
-        
+        

scrapy/trunk/scrapy/contrib/pbcluster/master/manager.py

@@ -6,7 +6,8 @@ from pydispatch import dispatcher
 from twisted.spread import pb
 from twisted.internet import reactor
 
-from scrapy.core import log, signals
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.engine import scrapyengine
 from scrapy.core.exceptions import NotConfigured
 from scrapy.conf import settings

scrapy/trunk/scrapy/contrib/pbcluster/worker/manager.py

@@ -3,7 +3,7 @@ import sys, os, time, datetime, pickle
 from twisted.internet import protocol, reactor
 from twisted.spread import pb
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.exceptions import NotConfigured
 from scrapy.conf import settings
 from scrapy.core.engine import scrapyengine
@@ -124,4 +124,4 @@ class ClusterWorker(pb.Root):
         return self.status(1, "No free slot to run another process.")
 
     def remote_register_crawler(self, pid, crawler):
-        self.crawlers[pid] = crawler
+        self.crawlers[pid] = crawler

scrapy/trunk/scrapy/contrib/pipeline/images.py

@@ -10,7 +10,7 @@ from cStringIO import StringIO
 
 import Image
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.stats import stats
 from scrapy.http import Request
 from scrapy.core.exceptions import DropItem, NotConfigured

scrapy/trunk/scrapy/contrib/pipeline/media.py

@@ -1,7 +1,7 @@
 from twisted.internet import defer
 
 from scrapy.utils.defer import mustbe_deferred, defer_result
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.engine import scrapyengine
 from scrapy.core.exceptions import DropItem, NotConfigured
 from scrapy.http import Request

scrapy/trunk/scrapy/contrib/pipeline/show.py

@@ -1,7 +1,7 @@
 """
 Pipeline to print Items
 """
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.exceptions import NotConfigured
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/contrib/rulengine/__init__.py

@@ -3,7 +3,7 @@ Here put the rules that the rules engine / pipline will take to process it.
 """
 from scrapy.core.exceptions import NotConfigured
 from scrapy.utils.misc import load_class
-from scrapy.core import log 
+from scrapy import log 
 from scrapy.conf import settings
 
 class Rule(object):

scrapy/trunk/scrapy/contrib/rulengine/pipeline.py

@@ -1,7 +1,7 @@
 """
 Represent the pipepline of execution to the rules engine.
 """
-from scrapy.core import log
+from scrapy import log
 from scrapy.contrib.rulengine.exceptions import RulesNotLoaded
 
 from scrapy.contrib.rulengine import rules

scrapy/trunk/scrapy/contrib/spider/reloader.py

@@ -5,7 +5,8 @@ This is to release any resources held on to by scraping spiders.
 """
 import sys
 from pydispatch import dispatcher
-from scrapy.core import log, signals
+from scrapy.core import signals
+from scrapy import log
 
 class SpiderReloader(object):
 

scrapy/trunk/scrapy/contrib/spidermiddleware/depth.py

@@ -4,7 +4,7 @@ Request inside the site being scraped. It can be used to limit the maximum
 depth to scrape or things like that
 """
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.http import Request
 from scrapy.stats import stats
 from scrapy.conf import settings

scrapy/trunk/scrapy/contrib/spidermiddleware/limit.py

@@ -12,7 +12,7 @@ will be applied. If given a value of 0, no limit will be applied.
 from scrapy.core.engine import scrapyengine
 from scrapy.conf import settings
 from scrapy.http import Request
-from scrapy.core import log
+from scrapy import log
 
 class RequestLimitMiddleware(object):
     #_last_queue_size = 0

scrapy/trunk/scrapy/contrib/spidermiddleware/offsite.py

@@ -3,7 +3,7 @@ OffsiteMiddleware: Filters out Requests for URLs outside the domains covered by
 the spider.
 """
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.http import Request
 from scrapy.utils.url import url_is_from_spider
 

scrapy/trunk/scrapy/contrib/spidermiddleware/referer.py

@@ -3,7 +3,6 @@ RefererMiddleware: populates Request referer field, based on the Response which
 originated it.
 """
 
-from scrapy.core import log
 from scrapy.http import Request
 
 class RefererMiddleware(object):

scrapy/trunk/scrapy/contrib/spidermiddleware/urllength.py

@@ -2,7 +2,7 @@
 UrlLengthMiddleware: Filters out requests with URLs longer than URLLENGTH_LIMIT
 """
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.http import Request
 from scrapy.core.exceptions import NotConfigured
 from scrapy.conf import settings

scrapy/trunk/scrapy/core/downloader/manager.py

@@ -10,7 +10,7 @@ from scrapy.core.exceptions import IgnoreRequest
 from scrapy.spider import spiders
 from scrapy.core.downloader.handlers import download_any
 from scrapy.core.downloader.middleware import DownloaderMiddlewareManager
-from scrapy.core import log
+from scrapy import log
 from scrapy.conf import settings
 from scrapy.utils.defer import chain_deferred, mustbe_deferred
 

scrapy/trunk/scrapy/core/downloader/middleware.py

@@ -1,7 +1,8 @@
 """
 request-response middleware extension
 """
-from scrapy.core import signals, log
+from scrapy.core import signals
+from scrapy import log
 from scrapy.http import Request, Response
 from scrapy.core.exceptions import NotConfigured
 from scrapy.utils.misc import load_class

scrapy/trunk/scrapy/core/engine.py

@@ -8,7 +8,8 @@ from twisted.internet import defer, reactor, task
 from twisted.python.failure import Failure
 from pydispatch import dispatcher
 
-from scrapy.core import signals, log
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.scheduler import Scheduler
 from scrapy.core.downloader import Downloader
 from scrapy.http import Response, Request

scrapy/trunk/scrapy/core/manager.py

@@ -1,11 +1,11 @@
 import signal
 
 from scrapy.extension import extensions
-from scrapy.core import log
+from scrapy import log
 from scrapy.http import Request
 from scrapy.core.engine import scrapyengine
 from scrapy.spider import spiders
-from scrapy.utils.defer import load_class
+from scrapy.utils.misc import load_class
 from scrapy.utils.url import is_url
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/core/scheduler/schedulers.py

@@ -5,7 +5,7 @@ The Scrapy Scheduler
 from twisted.internet import defer
 
 from scrapy.core.scheduler.filter import GroupFilter
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.exceptions import IgnoreRequest
 from scrapy.utils.datatypes import PriorityQueue, PriorityStack
 from scrapy.utils.defer import defer_fail

scrapy/trunk/scrapy/core/signals.py

@@ -3,7 +3,7 @@ Scrapy core signals
 """
 from pydispatch import dispatcher
 
-from scrapy.core import log
+from scrapy import log
 
 # After the execution engine has started
 # args: None

scrapy/trunk/scrapy/extension/__init__.py

@@ -5,7 +5,7 @@ ExtensionManager (extensions) to be used as singleton.
 """
 from scrapy.core.exceptions import NotConfigured
 from scrapy.utils.misc import load_class
-from scrapy.core import log
+from scrapy import log
 from scrapy.conf import settings
 
 class ExtensionManager(object):

scrapy/trunk/scrapy/item/pipeline.py

@@ -1,4 +1,4 @@
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.exceptions import DropItem, NotConfigured
 from scrapy.item import ScrapedItem
 from scrapy.utils.misc import load_class

scrapy/trunk/scrapy/log/__init__.py

@@ -1,8 +1,10 @@
 """ 
 Crawler logging functionality
 """
-from twisted.python import log
 import sys
+
+from twisted.python import log
+
 from scrapy.conf import settings
  
 # Logging levels

scrapy/trunk/scrapy/mail/__init__.py

@@ -6,7 +6,7 @@ from email.MIMEText import MIMEText
 from email.Utils import COMMASPACE, formatdate
 from email import Encoders
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.exceptions import NotConfigured
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/replay/__init__.py

@@ -8,7 +8,8 @@ import tarfile
 
 from pydispatch import dispatcher
 
-from scrapy.core import signals, log
+from scrapy.core import signals
+from scrapy import log
 from scrapy.core.manager import scrapymanager
 from scrapy.core.exceptions import NotConfigured
 from scrapy.conf import settings

scrapy/trunk/scrapy/spider/manager.py

@@ -9,7 +9,7 @@ import urlparse
 from twisted.plugin import getCache
 
 from scrapy.spider.models import ISpider
-from scrapy.core import log
+from scrapy import log
 from scrapy.conf import settings
 from scrapy.utils.url import url_is_from_spider
 

scrapy/trunk/scrapy/spider/middleware.py

@@ -5,7 +5,7 @@ Spider middleware manager
 
 from twisted.python.failure import Failure
 
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.exceptions import NotConfigured
 from scrapy.utils.misc import load_class
 from scrapy.utils.defer import mustbe_deferred

scrapy/trunk/scrapy/stats/statscollector.py

@@ -5,7 +5,8 @@ import pprint
 
 from pydispatch import dispatcher
 
-from scrapy.core import signals, log
+from scrapy.core import signals
+from scrapy import log
 from scrapy.utils.misc import stats_getpath
 from scrapy.conf import settings
 

scrapy/trunk/scrapy/utils/db.py

@@ -3,7 +3,7 @@ Function for dealing with databases
 """
 import re
 from scrapy.conf import settings
-from scrapy.core import log
+from scrapy import log
 from scrapy.core.engine import scrapyengine
 
 def mysql_connect(db_uri, **kwargs):
@@ -36,4 +36,4 @@ def mysql_connect(db_uri, **kwargs):
             conn.ping()
         scrapyengine.addtask(_ping, settings.getint("MYSQL_CONNECTION_PING_PERIOD", 600))
         
-        return conn
+        return conn