From: Daira Hopwood Date: Tue, 22 Sep 2015 15:40:53 +0000 (+0100) Subject: The type of deque elements differs between the uploader and downloader. X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/module-simplejson.scanner.html?a=commitdiff_plain;h=305f4a5ea7d6bc24ce04e5b2e1d9856ee59d8cc5;p=tahoe-lafs%2Ftahoe-lafs.git The type of deque elements differs between the uploader and downloader. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 7f7b719d..96250efd 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -152,12 +152,12 @@ class QueueMixin(HookMixin): if self._stopped: return try: - relpath_u = self._deque.pop() + item = self._deque.pop() except IndexError: self._log("deque is now empty") self._lazy_tail.addCallback(lambda ign: self._when_queue_is_empty()) else: - self._lazy_tail.addCallback(lambda ign: self._process(relpath_u)) + self._lazy_tail.addCallback(lambda ign: self._process(item)) self._lazy_tail.addBoth(self._call_hook, 'processed') self._lazy_tail.addErrback(log.err) self._lazy_tail.addCallback(lambda ign: task.deferLater(reactor, self._turn_delay, self._turn_deque))