From 47d66c66845df5d322362370eeb01397b2673bb9 Mon Sep 17 00:00:00 2001 From: Vostretsov Nikita Date: Mon, 15 Jul 2019 02:53:07 +0500 Subject: [PATCH] remove priority as parameter, let every queue decide for itself --- scrapy/pqueues.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scrapy/pqueues.py b/scrapy/pqueues.py index 41d088ce2..2495e3413 100644 --- a/scrapy/pqueues.py +++ b/scrapy/pqueues.py @@ -60,12 +60,12 @@ class _SlotPriorityQueues(object): del self.pqueues[slot] return request - def push_slot(self, slot, obj, priority): + def push_slot(self, slot, obj): """ Push an object to a priority queue for this slot """ if slot not in self.pqueues: self.pqueues[slot] = self.pqfactory(slot) queue = self.pqueues[slot] - queue.push(obj, priority) + queue.push(obj) def close(self): active = {slot: queue.close() @@ -108,7 +108,8 @@ class ScrapyPriorityQueue(object): self.key + '/' + str(key), startprios) - def push(self, obj, priority=0): + def push(self, obj): + priority = -obj.priority if priority not in self.queues: self.queues[priority] = self.qfactory(priority) q = self.queues[priority] @@ -198,9 +199,9 @@ class DownloaderAwarePriorityQueue(object): request = self._slot_pqueues.pop_slot(slot) return request - def push(self, request, priority): + def push(self, request): slot = self._downloader_interface.get_slot_key(request) - self._slot_pqueues.push_slot(slot, request, priority) + self._slot_pqueues.push_slot(slot, request) def close(self): return self._slot_pqueues.close()