more readable implementation

whalebot-helmsman · Feb 19, 2020 · 67146b2 · 67146b2
1 parent 15badc4
commit 67146b2
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/scrapy/spiders/__init__.py b/scrapy/spiders/__init__.py
@@ -80,9 +80,17 @@ def start_requests(self):
                 yield Request(url, dont_filter=True)
 
     def start_requests_with_control(self):
-        sig = self.WaitUntilQueueEmpty
-        gen_ = ((r, sig) if r != sig else (r,) for r in self.start_requests())
-        return iflatten(gen_)
+
+        def gen_():
+            sig = self.WaitUntilQueueEmpty
+
+            for r in self.start_requests():
+                if r != sig:
+                    yield (r, sig)
+                else:
+                    yield (r,)
+
+        return iflatten(gen_())
 
     def make_requests_from_url(self, url):
         """ This method is deprecated. """