浏览代码

no bare except

Thomas Waldmann 10 年之前
父节点
当前提交
a21da5d2e0
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 1
      attic/archive.py
  2. 1 3
      attic/fuse.py

+ 1 - 1
attic/archive.py

@@ -587,7 +587,7 @@ class ArchiveChecker:
                 continue
                 continue
             try:
             try:
                 archive = msgpack.unpackb(data)
                 archive = msgpack.unpackb(data)
-            except:
+            except Exception:
                 continue
                 continue
             if isinstance(archive, dict) and b'items' in archive and b'cmdline' in archive:
             if isinstance(archive, dict) and b'items' in archive and b'cmdline' in archive:
                 self.report_progress('Found archive ' + archive[b'name'].decode('utf-8'), error=True)
                 self.report_progress('Found archive ' + archive[b'name'].decode('utf-8'), error=True)

+ 1 - 3
attic/fuse.py

@@ -228,7 +228,5 @@ class AtticOperations(llfuse.Operations):
             daemonize()
             daemonize()
         try:
         try:
             llfuse.main(single=True)
             llfuse.main(single=True)
-        except:
+        finally:
             llfuse.close()
             llfuse.close()
-            raise
-        llfuse.close()