From 354dceda79e5f7a1d6d9960aeff60d1be951548f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Tue, 26 Feb 2019 10:09:25 -0500 Subject: [PATCH] Get rid of last returnValue use Supporting it with Eliot is challenging and we don't actually need it. --- src/allmydata/frontends/magic_folder.py | 5 ++--- src/allmydata/test/__init__.py | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index e77b4989d..be4b6e62b 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -1572,10 +1572,9 @@ class Downloader(QueueMixin, WriteFileMixin): while True: try: - data = yield self._scan_remote_collective(scan_self=True) + yield self._scan_remote_collective(scan_self=True) self._begin_processing() - defer.returnValue(data) - break + return except Exception: self._status_reporter( False, "Initial scan has failed", diff --git a/src/allmydata/test/__init__.py b/src/allmydata/test/__init__.py index 03bd56f5d..4ee3e8060 100644 --- a/src/allmydata/test/__init__.py +++ b/src/allmydata/test/__init__.py @@ -57,3 +57,6 @@ import sys if sys.platform == "win32": from allmydata.windows.fixups import initialize initialize() + +from eliot import to_file +to_file(open("eliot.log", "w"))