[pypy-commit] pypy dynamic-specialized-tuple: fix, result of a bad merge

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: dynamic-specialized-tuple
Changeset: r54047:244768707f09
Date: 2012-03-28 17:35 -0400
http://bitbucket.org/pypy/pypy/changeset/244768707f09/

Log:	fix, result of a bad merge

diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -399,7 +399,7 @@
 
     def unpackiterable(self, w_obj, expected_length=-1):
         if isinstance(w_obj, W_AbstractTupleObject):
-            t = w_obj.getitems_copy(space)
+            t = w_obj.getitems_copy(self)
         elif type(w_obj) is W_ListObject:
             t = w_obj.getitems_copy()
         else:
@@ -413,7 +413,7 @@
         """ Fast paths
         """
         if isinstance(w_obj, W_AbstractTupleObject):
-            t = w_obj.tolist(space)
+            t = w_obj.tolist(self)
         elif type(w_obj) is W_ListObject:
             if unroll:
                 t = w_obj.getitems_unroll()