From c64123cc63fe3067d28a576f879a0debd04d55ea Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Mon, 8 Aug 2011 15:09:43 -0300 Subject: [PATCH] proper fix to what r2760 is supposed to fix --- scrapy/core/scheduler.py | 2 +- scrapy/utils/pqueue.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/scrapy/core/scheduler.py b/scrapy/core/scheduler.py index f71ef0e48..f6f414411 100644 --- a/scrapy/core/scheduler.py +++ b/scrapy/core/scheduler.py @@ -26,7 +26,7 @@ class Scheduler(object): return cls(dupefilter, job_dir(settings), dqclass) def has_pending_requests(self): - return len(self.dqs) or len(self.mqs) + return len(self) > 0 def open(self, spider): self.spider = spider diff --git a/scrapy/utils/pqueue.py b/scrapy/utils/pqueue.py index bf613ea6c..16910239c 100644 --- a/scrapy/utils/pqueue.py +++ b/scrapy/utils/pqueue.py @@ -53,6 +53,3 @@ class PriorityQueue(object): def __len__(self): return sum(len(x) for x in self.queues.values()) if self.queues else 0 - - def __nonzero__(self): - return bool(self.queues)