From 307f8b3321364c83e42c8e59c7bdc14a527e8ac1 Mon Sep 17 00:00:00 2001 From: elpolilla Date: Wed, 7 Jan 2009 17:31:06 +0000 Subject: [PATCH] . Modified loading of command-specific settings (were loaded as defaults, now as overrides) . Removed duplicated loading of extensions in shell command --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40676 --- scrapy/trunk/scrapy/command/cmdline.py | 2 +- scrapy/trunk/scrapy/command/commands/shell.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/scrapy/trunk/scrapy/command/cmdline.py b/scrapy/trunk/scrapy/command/cmdline.py index 0ef238448..2282fe19a 100644 --- a/scrapy/trunk/scrapy/command/cmdline.py +++ b/scrapy/trunk/scrapy/command/cmdline.py @@ -88,7 +88,7 @@ def command_settings(cmdname): if basepath: try: module = __import__('%s.%s' % (basepath, cmdname), {}, {}, ['']) - update_defaults(settings.defaults, module) + update_defaults(settings.overrides, module) except ImportError: pass diff --git a/scrapy/trunk/scrapy/command/commands/shell.py b/scrapy/trunk/scrapy/command/commands/shell.py index 76f96a4ed..32bacd20b 100644 --- a/scrapy/trunk/scrapy/command/commands/shell.py +++ b/scrapy/trunk/scrapy/command/commands/shell.py @@ -115,10 +115,6 @@ class Command(ScrapyCommand): print "Scrapy %s - Interactive scraping console\n" % scrapy.__version__ - print "Enabling Scrapy extensions...", - extensions.load() - print "done" - def _console_thread(): def _get_magic(shell, arg):