Changeset 1941:0e63b80718c7

Timestamp:

03/04/10 10:58:18 (5 months ago)

Author:

Pablo Hoffman <pablo@…>

Branch:

default

Message:

replaced hacky command_executed dict by standard signal

Files:

• scrapy/command/cmdline.py (modified) (2 diffs)

scrapy/command/cmdline.py

@@ -8 +8 @@
 import scrapy
 from scrapy import log
-from scrapy.spider import spiders
 from scrapy.xlib import lsprofcalltree
 from scrapy.conf import settings
 from scrapy.command.models import ScrapyCommand
+from scrapy.utils.signal import send_catch_log
 
-# This dict holds information about the executed command for later use
-command_executed = {}
-
-def _save_command_executed(cmdname, cmd, args, opts):
-    """Save command executed info for later reference"""
-    command_executed['name'] = cmdname
-    command_executed['class'] = cmd
-    command_executed['args'] = args[:]
-    command_executed['opts'] = opts.__dict__.copy()
+# Signal that carries information about the command which was executed
+# args: cmdname, cmdobj, args, opts
+command_executed = object()
 
 def _find_commands(dir):
@@ -128 +122 @@
 
     del args[0]  # remove command name from args
-    _save_command_executed(cmdname, cmd, args, opts)
+    send_catch_log(signal=command_executed, cmdname=cmdname, cmdobj=cmd, \
+        args=args, opts=opts)
     from scrapy.core.manager import scrapymanager
     scrapymanager.configure(control_reactor=True)