address Erics comments

galaxyproject · Oct 2, 2017 · 5a6c3e7 · 5a6c3e7
1 parent dd7366d
commit 5a6c3e7
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
@@ -1593,15 +1593,12 @@ def set_meta(self, dataset, overwrite=True, **kwd):
             log.warning('%s, set_meta Exception: %s', self, e)
 
     def sniff(self, filename):
-        try:
-            if filename and tarfile.is_tarfile(filename):
+        if filename and tarfile.is_tarfile(filename):
+            try:
                 with tarfile.open(filename, 'r') as temptar:
-                    if 'postgresql/db/PG_VERSION' in temptar.getnames():
-                        return True
-                    else:
-                        return False
-        except Exception as e:
-            log.warning('%s, sniff Exception: %s', self, e)
+                    return 'postgresql/db/PG_VERSION' in temptar.getnames()
+            except Exception as e:
+                log.warning('%s, sniff Exception: %s', self, e)
         return False
 
     def set_peek(self, dataset, is_multi_byte=False):