From 39381ba89890ca9132ddf0d2a19e93f1d35dba4f Mon Sep 17 00:00:00 2001 From: jgaff Date: Fri, 5 Jan 2018 13:10:54 -0600 Subject: [PATCH] Python 2 syntax fix --- mdf_forge/forge.py | 3 ++- tests/test_forge.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mdf_forge/forge.py b/mdf_forge/forge.py index 9a642ba..daf218d 100644 --- a/mdf_forge/forge.py +++ b/mdf_forge/forge.py @@ -935,10 +935,11 @@ def http_stream(self, results, verbose=True): """ if self.__anonymous: print_("Error: Anonymous HTTP download not yet supported.") - return { + yield { "success": False, "message": "Anonymous HTTP download not yet supported." } + return # If results have info attached, remove it if type(results) is tuple: results = results[0] diff --git a/tests/test_forge.py b/tests/test_forge.py index d632bca..0f59963 100644 --- a/tests/test_forge.py +++ b/tests/test_forge.py @@ -889,7 +889,9 @@ def test_forge_anonymous(capsys): out, err = capsys.readouterr() assert "Error: Anonymous Globus Transfer not supported." in out # http_stream - with pytest.raises(StopIteration): - next(f.http_stream({})) + res = f.http_stream({}) + assert next(res)["success"] is False out, err = capsys.readouterr() assert "Error: Anonymous HTTP download not yet supported." in out + with pytest.raises(StopIteration): + next(res)