From 2cb0cfe7ea9acc91fe3da91d20c13d78c3ba1b4c Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Mon, 24 Aug 2009 07:29:30 -0300
Subject: [PATCH] simplified some code

---
 scrapy/core/scraper.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/scrapy/core/scraper.py b/scrapy/core/scraper.py
index ffae1a47a..18095216e 100644
--- a/scrapy/core/scraper.py
+++ b/scrapy/core/scraper.py
@@ -5,7 +5,7 @@ from twisted.python.failure import Failure
 from twisted.internet import defer
 
 from scrapy.utils.defer import defer_result, defer_succeed, parallel
-from scrapy.utils.misc import arg_to_iter, load_object
+from scrapy.utils.misc import load_object
 from scrapy.utils.signal import send_catch_log
 from scrapy.core.exceptions import IgnoreRequest, DropItem
 from scrapy.core import signals
@@ -131,10 +131,7 @@ class Scraper(object):
         return request.deferred.addCallback(self._iterable_spider_output)
 
     def _iterable_spider_output(self, result):
-        if isinstance(result, (BaseItem, Request)):
-            return [result]
-        else:
-            return arg_to_iter(result)
+        return [result] if isinstance(result, (BaseItem, Request)) else result
 
     def handle_spider_error(self, _failure, request, spider, propagated_failure=None):
         referer = request.headers.get('Referer', None)
@@ -177,7 +174,7 @@ class Scraper(object):
         elif output is None:
             pass
         else:
-            log.msg("Spider must return Request, BaseItem or None, got '%s' in %s" % \
+            log.msg("Spider must return Request, BaseItem or None, got %r in %s" % \
                 (type(output).__name__, request), log.ERROR, domain=domain)
 
     def _check_propagated_failure(self, spider_failure, propagated_failure, request, spider):