rewire a try/finally with a yield inside to be compatible with python 2.4

Apparently you can't put a 'yield' inside a try/finally in older versions of
python.  lame.

diff --git a/git.py b/git.py
index 998bc3c257609650bf490f55161882324907691c..17edcca457902c0a8856370c8995b0069ac0e9c2 100644 (file)
--- a/git.py
+++ b/git.py
@@ -580,12 +580,9 @@ class CatPipe:
             yield type
             for blob in it:
                 yield blob
-        finally:
-            try:
-                while 1:
-                    it.next()
-            except StopIteration:
-                pass
+        except StopIteration:
+            while 1:
+                it.next()
         assert(self.p.stdout.readline() == '\n')
 
     def _slow_get(self, id):