From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 28 Dec 2013 13:59:44 +0000 (+0000)
Subject: symm/multigen: Fix for Python 2.5.
X-Git-Tag: 2.1.6.1~1
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/28ffcb2af24deaf7d77f62b48246b768e16c6a07

symm/multigen: Fix for Python 2.5.

The top-level `next' function was introduced in 2.6, so use `.next()'
and catch `StopIteration'.
---

diff --git a/symm/multigen b/symm/multigen
index 2d626c22..d532cda7 100755
--- a/symm/multigen
+++ b/symm/multigen
@@ -218,8 +218,9 @@ class ParseState (object):
     me._it = iter(text.splitlines(True))
     me.step()
   def step(me):
-    me.curr = next(me._it, None)
-    if me.curr is not None: me._i += 1
+    try: me.curr = me._it.next()
+    except StopIteration: me.curr = None
+    else: me._i += 1
   def error(me, msg):
     die('%s:%d: %s' % (me._file, me._i, msg))