From: Robert S. Edmonds <edmonds@debian.org>
Date: Mon, 6 May 2013 19:32:19 +0000 (-0400)
Subject: Revert "rewrite asserts to be side-effect free"
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8a48d2f5ae39741296338c00e3f3a80620baaab2;p=packages%2Fb%2Fbup.git

Revert "rewrite asserts to be side-effect free"

This reverts commit d43cf2b3c134480cbaab0356d5dd4c7090cd33b2.
---

diff --git a/lib/bup/git.py b/lib/bup/git.py
index 8710b5a..ad4668b 100644
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -962,8 +962,7 @@ class CatPipe:
         if not self.p or self.p.poll() != None:
             self._restart()
         assert(self.p)
-        r = self.p.poll()
-        assert(r == None)
+        assert(self.p.poll() == None)
         if self.inprogress:
             log('_fast_get: opening %r while %r is open\n'
                 % (id, self.inprogress))
@@ -989,8 +988,7 @@ class CatPipe:
             yield type
             for blob in it:
                 yield blob
-            l = self.p.stdout.readline()
-            assert(l == '\n')
+            assert(self.p.stdout.readline() == '\n')
             self.inprogress = None
         except Exception, e:
             it.abort()