[pypy-svn] r54279 - in pypy/dist/pypy/objspace/std: . test

fijal at codespeak.net fijal at codespeak.net
Wed Apr 30 16:46:47 CEST 2008


Author: fijal
Date: Wed Apr 30 16:46:47 2008
New Revision: 54279

Removed:
   pypy/dist/pypy/objspace/std/tuplemultiobject.py
Modified:
   pypy/dist/pypy/objspace/std/model.py
   pypy/dist/pypy/objspace/std/objspace.py
   pypy/dist/pypy/objspace/std/test/test_tupleobject.py
   pypy/dist/pypy/objspace/std/tupletype.py
Log:
Revert multituple, stays on branch


Modified: pypy/dist/pypy/objspace/std/model.py
==============================================================================
--- pypy/dist/pypy/objspace/std/model.py	(original)
+++ pypy/dist/pypy/objspace/std/model.py	Wed Apr 30 16:46:47 2008
@@ -14,7 +14,6 @@
     "withstrjoin"    : ["strjoinobject.W_StringJoinObject"],
     "withmultidict"  : ["dictmultiobject.W_DictMultiObject",
                         "dictmultiobject.W_DictMultiIterObject"],
-    "withmultituple" : ["tuplemultiobject.W_TupleMultiObject"],
     "withmultilist"  : ["listmultiobject.W_ListMultiObject"],
     "withrope"       : ["ropeobject.W_RopeObject",
                         "ropeobject.W_RopeIterObject"],
@@ -65,7 +64,6 @@
         from pypy.objspace.std import setobject
         from pypy.objspace.std import smallintobject
         from pypy.objspace.std import tupleobject
-        from pypy.objspace.std import tuplemultiobject
         from pypy.objspace.std import listobject
         from pypy.objspace.std import dictobject
         from pypy.objspace.std import dictmultiobject
@@ -142,9 +140,6 @@
         if config.objspace.std.withrope:
             del self.typeorder[stringobject.W_StringObject]
 
-        if config.objspace.std.withmultituple:
-            del self.typeorder[tupleobject.W_TupleObject]
-
         #check if we missed implementations
         from pypy.objspace.std.objspace import _registered_implementations
         for implcls in _registered_implementations:

Modified: pypy/dist/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objspace.py	(original)
+++ pypy/dist/pypy/objspace/std/objspace.py	Wed Apr 30 16:46:47 2008
@@ -240,12 +240,8 @@
             self.DictObjectCls = dictobject.W_DictObject
         assert self.DictObjectCls in self.model.typeorder
 
-        if self.config.objspace.std.withmultituple:
-            from pypy.objspace.std import tuplemultiobject
-            self.TupleObjectCls = tuplemultiobject.W_TupleMultiObject
-        else:
-            from pypy.objspace.std import tupleobject
-            self.TupleObjectCls = tupleobject.W_TupleObject
+        from pypy.objspace.std import tupleobject
+        self.TupleObjectCls = tupleobject.W_TupleObject
 
         if not self.config.objspace.std.withrope:
             from pypy.objspace.std import stringobject

Modified: pypy/dist/pypy/objspace/std/test/test_tupleobject.py
==============================================================================
--- pypy/dist/pypy/objspace/std/test/test_tupleobject.py	(original)
+++ pypy/dist/pypy/objspace/std/test/test_tupleobject.py	Wed Apr 30 16:46:47 2008
@@ -317,9 +317,4 @@
         assert repr((1,)) == '(1,)'
         assert repr(()) == '()'
         assert repr((1,2,3)) == '(1, 2, 3)'
-
-class AppTestMultiTuple(AppTestW_TupleObject):
-    def setup_class(cls):
-        from pypy.conftest import gettestobjspace
-        cls.space = gettestobjspace(**{"objspace.std.withmultituple": True})
         

Modified: pypy/dist/pypy/objspace/std/tupletype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/tupletype.py	(original)
+++ pypy/dist/pypy/objspace/std/tupletype.py	Wed Apr 30 16:46:47 2008
@@ -3,9 +3,6 @@
 
 def wraptuple(space, list_w):
     from pypy.objspace.std.tupleobject import W_TupleObject
-    if space.config.objspace.std.withmultituple:
-        from pypy.objspace.std.tuplemultiobject import W_TupleMultiObject
-        return W_TupleMultiObject(list_w)
     return W_TupleObject(list_w)
 
 def descr__new__(space, w_tupletype, w_sequence=NoneNotWrapped):



More information about the Pypy-commit mailing list