[pypy-svn] r58049 - in pypy/branch/tuple-nonresizable-395/pypy: . interpreter objspace/std

[fijal at codespeak.net]

Author: fijal
Date: Wed Sep 10 19:26:46 2008
New Revision: 58049

Modified:
   pypy/branch/tuple-nonresizable-395/pypy/TODO.BEFOREMERGE
   pypy/branch/tuple-nonresizable-395/pypy/interpreter/baseobjspace.py
   pypy/branch/tuple-nonresizable-395/pypy/objspace/std/listobject.py
Log:
Kill obscure hacks. Update TODO


Modified: pypy/branch/tuple-nonresizable-395/pypy/TODO.BEFOREMERGE
==============================================================================
--- pypy/branch/tuple-nonresizable-395/pypy/TODO.BEFOREMERGE	(original)
+++ pypy/branch/tuple-nonresizable-395/pypy/TODO.BEFOREMERGE	Wed Sep 10 19:26:46 2008
@@ -1,4 +1,3 @@
 
-* make sure to kill W_ListObject.__init__ hack
 * avoid duplication in FastSeqIter, if possible
 * add objspace.unpackiterable shortcuts

Modified: pypy/branch/tuple-nonresizable-395/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/branch/tuple-nonresizable-395/pypy/interpreter/baseobjspace.py	(original)
+++ pypy/branch/tuple-nonresizable-395/pypy/interpreter/baseobjspace.py	Wed Sep 10 19:26:46 2008
@@ -656,9 +656,6 @@
                 plural = "s"
             raise UnpackValueError("need more than %d value%s to unpack" %
                                    (i, plural))
-        # XXX remember to kill
-        items.append(None)
-        items.pop()
         return items
 
     def viewiterable(self, w_iterable, expected_length=-1):

Modified: pypy/branch/tuple-nonresizable-395/pypy/objspace/std/listobject.py
==============================================================================
--- pypy/branch/tuple-nonresizable-395/pypy/objspace/std/listobject.py	(original)
+++ pypy/branch/tuple-nonresizable-395/pypy/objspace/std/listobject.py	Wed Sep 10 19:26:46 2008
@@ -13,9 +13,6 @@
     from pypy.objspace.std.listtype import list_typedef as typedef
     
     def __init__(w_self, wrappeditems):
-        #if len(wrappeditems) > 0:
-        wrappeditems.append(None)
-        wrappeditems.pop()
         w_self.wrappeditems = wrappeditems
 
     def __repr__(w_self):