-

cool-RR · cool-RR · commit 5e13c29a6455 · 2013-09-18T22:51:27.000+03:00
diff --git a/source_py2/python_toolbox/cute_iter_tools.py b/source_py2/python_toolbox/cute_iter_tools.py
@@ -167,7 +167,7 @@ def iter_with(iterable, context_manager):
     while True:
         
         with context_manager:
-            next_item = iterator.next()
+            next_item = next(iterator)
             # You may notice that we are not `except`ing a `StopIteration`
             # here; If we get one, it'll just get propagated and end *this*
             # iterator. todo: I just realized this will probably cause a bug
diff --git a/source_py2/python_toolbox/dict_tools.py b/source_py2/python_toolbox/dict_tools.py
@@ -129,7 +129,7 @@ def devour_items(d):
 def devour_keys(d):
     '''Iterator that pops keys from `d` until it's exhaused (i.e. empty).'''
     while d:
-        key = d.iterkeys().next()
+        key = next(d.iterkeys())
         del d[key]
         yield key
         
diff --git a/source_py2/python_toolbox/nifty_collections/lazy_tuple.py b/source_py2/python_toolbox/nifty_collections/lazy_tuple.py
@@ -7,7 +7,6 @@
 See its documentation for more information.
 '''
 
-
 import threading
 import collections
 
@@ -153,7 +152,7 @@ def exhaust(self, i=infinity):
         while len(self.collected_data) <= exhaustion_point:
             try:
                 with self.lock:
-                    self.collected_data.append(self._iterator.next())
+                    self.collected_data.append(next(self._iterator))
             except StopIteration:
                 self.exhausted = True
                 break
diff --git a/source_py2/python_toolbox/nifty_collections/ordered_dict.py b/source_py2/python_toolbox/nifty_collections/ordered_dict.py
@@ -52,7 +52,7 @@ def sort(self, key=None, reversed=False):
         for key_ in sorted_keys[1::step]:
             self.move_to_end(key_)
         
-            
+    
     def index(self, key):
         '''Get the index number of `key`.'''
         if key not in self:
diff --git a/source_py2/python_toolbox/nifty_collections/ordered_set.py b/source_py2/python_toolbox/nifty_collections/ordered_set.py
@@ -74,7 +74,7 @@ def pop(self, last=True):
         """Remove and return an arbitrary set element."""
         if not self:
             raise KeyError('set is empty')
-        key = reversed(self).next() if last else iter(self).next()
+        key = next(reversed(self) if last else iter(self))
         self.discard(key)
         return key
 
diff --git a/source_py2/python_toolbox/sequence_tools.py b/source_py2/python_toolbox/sequence_tools.py
@@ -34,7 +34,7 @@ def flatten(iterable):
 
     iterator = iter(iterable)
     try:
-        first_item = iterator.next()
+        first_item = next(iterator)
     except StopIteration:
         return []
     return sum(iterator, first_item)
diff --git a/source_py2/test_python_toolbox/third_party/forked_mapping_tests.py b/source_py2/test_python_toolbox/third_party/forked_mapping_tests.py
@@ -77,8 +77,8 @@ def check_iterandlist(iter, lst, ref):
         check_iterandlist(d.itervalues(), d.values(), self.reference.values())
         check_iterandlist(d.iteritems(), d.items(), self.reference.items())
         #get
-        key, value = d.iteritems().next()
-        knownkey, knownvalue = self.other.iteritems().next()
+        key, value = next(d.iteritems())
+        knownkey, knownvalue = next(self.other.iteritems())
         self.assertEqual(d.get(key, knownvalue), value)
         self.assertEqual(d.get(knownkey, knownvalue), knownvalue)
         self.assertNotIn(knownkey, d)
@@ -103,8 +103,8 @@ def test_write(self):
         self.assertEqual(dict(p), self.reference)
         d = self._full_mapping(self.reference)
         #setdefault
-        key, value = d.iteritems().next()
-        knownkey, knownvalue = self.other.iteritems().next()
+        key, value = next(d.iteritems())
+        knownkey, knownvalue = next(self.other.iteritems())
         self.assertEqual(d.setdefault(key, knownvalue), value)
         self.assertEqual(d[key], value)
         self.assertEqual(d.setdefault(knownkey, knownvalue), knownvalue)
diff --git a/source_py3/python_toolbox/nifty_collections/lazy_tuple.py b/source_py3/python_toolbox/nifty_collections/lazy_tuple.py
@@ -7,8 +7,6 @@
 See its documentation for more information.
 '''
 
-
-
 import threading
 import collections
 
diff --git a/source_py3/python_toolbox/nifty_collections/ordered_dict.py b/source_py3/python_toolbox/nifty_collections/ordered_dict.py
@@ -28,6 +28,7 @@ def sort(self, key=None, reversed=False):
         for key_ in sorted_keys[1::step]:
             self.move_to_end(key_)
         
+    
     def index(self, key):
         '''Get the index number of `key`.'''
         if key not in self:
