LIU-66: reorder.

ICRAR · Jul 19, 2021 · 7359e3f · 7359e3f
1 parent 3d640f7
commit 7359e3f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/daliuge-engine/dlg/manager/rest.py b/daliuge-engine/dlg/manager/rest.py
@@ -24,14 +24,14 @@
 Data Managers (DROPManager and DataIslandManager) to the outside world.
 """
 
-import io
-import os
 import cgi
 import functools
+import io
 import json
 import logging
-import threading
+import os
 import tarfile
+import threading
 
 import bottle
 import pkg_resources
@@ -61,10 +61,7 @@ def fwrapper(*args, **kwargs):
         try:
             res = func(*args, **kwargs)
 
-            if isinstance(res, bytes):
-                return res
-
-            if isinstance(res, bottle.HTTPResponse):
+            if isinstance(res, (bytes, bottle.HTTPResponse)):
                 return res
 
             if res is not None:
@@ -390,6 +387,7 @@ def _tarfile_write(self, tar, headers, stream):
 
         tar.addfile(info, io.BytesIO(initial_bytes=''.join(content).encode()))
 
+
     @daliuge_aware
     def getLogFile(self, sessionId):
         fh = io.BytesIO()