From 305f4a5ea7d6bc24ce04e5b2e1d9856ee59d8cc5 Mon Sep 17 00:00:00 2001 From: Daira Hopwood <daira@jacaranda.org> Date: Tue, 22 Sep 2015 16:40:53 +0100 Subject: [PATCH] The type of deque elements differs between the uploader and downloader. Signed-off-by: Daira Hopwood <daira@jacaranda.org> --- src/allmydata/frontends/magic_folder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)) -- 2.45.2