From: W. Trevor King <wking@tremily.us>
Date: Sat, 21 Jul 2012 12:48:00 +0000 (-0400)
Subject: Python 3 scraps the iter(...).next() method, so use next(iter(...)).
X-Git-Tag: v0.2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c9a7bfcb2e4e77ed744e427505ad84f26a3ec98;p=igor.git

Python 3 scraps the iter(...).next() method, so use next(iter(...)).
---

diff --git a/igor/struct.py b/igor/struct.py
index 0d0837e..4887a14 100644
--- a/igor/struct.py
+++ b/igor/struct.py
@@ -252,11 +252,11 @@ class Field (object):
         _LOG.debug('unpack {} for {} {}'.format(data, self, self.format))
         iterator = iter(data)
         try:
-            items = [iterator.next() for i in range(self.arg_count)]
+            items = [next(iterator) for i in range(self.arg_count)]
         except StopIteration:
             raise ValueError('not enough data to unpack {}'.format(self))
         try:
-            iterator.next()
+            next(iterator)
         except StopIteration:
             pass
         else:
@@ -549,13 +549,13 @@ class Structure (_struct.Struct):
         iterator = iter(args)
         for f in self.fields:
             try:
-                items = [iterator.next() for i in range(f.arg_count)]
+                items = [next(iterator) for i in range(f.arg_count)]
             except StopIteration:
                 raise ValueError('not enough data to unpack {}.{}'.format(
                         self, f))
             data[f.name] = f.unpack_data(items)
         try:
-            iterator.next()
+            next(iterator)
         except StopIteration:
             pass
         else:
@@ -671,7 +671,7 @@ class DynamicStructure (Structure):
     ...         ],
     ...     byte_order='>')
 
-    >>> b = '\x00\x00\x00\x02\x01\x02\x03\x04'
+    >>> b = b'\x00\x00\x00\x02\x01\x02\x03\x04'
     >>> d = dynamic_length_vector.unpack(b)
     >>> pprint(d)
     {'data': array([258, 772]), 'length': 2}