Parcourir la source

Avoid bare except.

Jelmer Vernooij il y a 7 ans
Parent
commit
52f4addb19
5 fichiers modifiés avec 9 ajouts et 12 suppressions
  1. 3 3
      dulwich/client.py
  2. 2 2
      dulwich/object_store.py
  3. 1 1
      dulwich/porcelain.py
  4. 2 2
      dulwich/tests/test_object_store.py
  5. 1 4
      dulwich/web.py

+ 3 - 3
dulwich/client.py

@@ -361,7 +361,7 @@ class GitClient(object):
             result = self.fetch_pack(
                 path, determine_wants, target.get_graph_walker(), f.write,
                 progress)
-        except:
+        except BaseException:
             abort()
             raise
         else:
@@ -666,7 +666,7 @@ class TraditionalGitClient(GitClient):
 
             try:
                 new_refs = orig_new_refs = update_refs(dict(old_refs))
-            except:
+            except BaseException:
                 proto.write_pkt_line(None)
                 raise
 
@@ -737,7 +737,7 @@ class TraditionalGitClient(GitClient):
 
             try:
                 wants = determine_wants(refs)
-            except:
+            except BaseException:
                 proto.write_pkt_line(None)
                 raise
             if wants is not None:

+ 2 - 2
dulwich/object_store.py

@@ -435,7 +435,7 @@ class PackBasedObjectStore(BaseObjectStore):
         f, commit, abort = self.add_pack()
         try:
             write_pack_objects(f, objects)
-        except:
+        except BaseException:
             abort()
             raise
         else:
@@ -863,7 +863,7 @@ class MemoryObjectStore(BaseObjectStore):
                                       delta_iter=indexer)
             copier.verify()
             self._complete_thin_pack(f, indexer)
-        except:
+        except BaseException:
             abort()
             raise
         else:

+ 1 - 1
dulwich/porcelain.py

@@ -332,7 +332,7 @@ def clone(source, target=None, bare=False, checkout=None,
         if checkout and b"HEAD" in r.refs:
             errstream.write(b'Checking out HEAD\n')
             r.reset_index()
-    except:
+    except BaseException:
         r.close()
         raise
 

+ 2 - 2
dulwich/tests/test_object_store.py

@@ -224,7 +224,7 @@ class MemoryObjectStoreTests(ObjectStoreTests, TestCase):
         try:
             b = make_object(Blob, data=b"more yummy data")
             write_pack_objects(f, [(b, None)])
-        except:
+        except BaseException:
             abort()
             raise
         else:
@@ -377,7 +377,7 @@ class DiskObjectStoreTests(PackBasedObjectStoreTests, TestCase):
         try:
             b = make_object(Blob, data=b"more yummy data")
             write_pack_objects(f, [(b, None)])
-        except:
+        except BaseException:
             abort()
             raise
         else:

+ 1 - 4
dulwich/web.py

@@ -119,13 +119,10 @@ def send_file(req, f, content_type):
             if not data:
                 break
             yield data
-        f.close()
     except IOError:
-        f.close()
         yield req.error('Error reading file')
-    except:
+    finally:
         f.close()
-        raise
 
 
 def _url_to_path(url):