[pypy-svn] r75609 - pypy/branch/fast-forward/pypy/module/__builtin__

[benjamin at codespeak.net]

Author: benjamin
Date: Fri Jun 25 22:33:10 2010
New Revision: 75609

Modified:
   pypy/branch/fast-forward/pypy/module/__builtin__/functional.py
Log:
start must be an index

Modified: pypy/branch/fast-forward/pypy/module/__builtin__/functional.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/__builtin__/functional.py	(original)
+++ pypy/branch/fast-forward/pypy/module/__builtin__/functional.py	Fri Jun 25 22:33:10 2010
@@ -374,10 +374,12 @@
         self.w_iter = w_iter
         self.w_index = w_start
 
-    def descr___new__(space, w_subtype, w_iterable, w_start=None):
+    def descr___new__(space, w_subtype, w_iterable, w_start=NoneNotWrapped):
         self = space.allocate_instance(W_Enumerate, w_subtype)
         if w_start is None:
             w_start = space.wrap(0)
+        else:
+            w_start = space.index(w_start)
         self.__init__(space.iter(w_iterable), w_start)
         return space.wrap(self)