Fixed aliasing of next to __next__ and raw_input for IPython

jlstevens · jlstevens · commit 8189da3be838 · 2014-05-28T16:31:17.000+01:00
diff --git a/lancet/__init__.py b/lancet/__init__.py
@@ -52,7 +52,7 @@ class is designed to launch commands on Sun Grid Engine clusters.
 
 __version__ = "2013.11.2"
 
-import os, subprocess
+import os, sys, subprocess
 import param
 
 from lancet.core import *       # pyflakes:ignore (appropriate import)
@@ -133,6 +133,10 @@ def load_ipython_extension(ip):
     global _loaded
     if not _loaded:
         _loaded = True
+        from lancet import launch
+        if sys.version_info[0] == 2:
+            launch.input = lambda *args, **kwargs: raw_input(*args, **kwargs)
+
         plaintext_formatter = ip.display_formatter.formatters['text/plain']
         plaintext_formatter.for_type(Args, repr_pretty_annotated)
         plaintext_formatter.for_type(Command, repr_pretty_unannotated)
diff --git a/lancet/core.py b/lancet/core.py
@@ -185,7 +185,6 @@ def __next__(self):
         """
         raise StopIteration
 
-    # Python 2 support
     next = __next__
 
     def copy(self):
@@ -332,6 +331,8 @@ def __next__(self):
             self._exhausted=True
             return self.specs
 
+    next = __next__
+
     def _unique(self, sequence, idfun=repr):
         """
         Note: repr() must be implemented properly on all objects. This
diff --git a/lancet/dynamic.py b/lancet/dynamic.py
@@ -74,7 +74,6 @@ def __next__(self):
         self._next_val = StopIteration
         return current_val
 
-    # Python 2 support
     next = __next__
 
 
@@ -319,7 +318,6 @@ def __next__(self):
             else:
                 return  next(self.second)
 
-    # Python 2 support
     next = __next__
 
 
@@ -364,3 +362,4 @@ def __next__(self):
         else:
             second_spec = next(self.second)
             return self._cartesian_product(self._first_cached, second_spec)
+    next = __next__
