[pypy-svn] r65449 - pypy/trunk/pypy/objspace/std

[cfbolz at codespeak.net]

Author: cfbolz
Date: Wed May 27 14:41:46 2009
New Revision: 65449

Modified:
   pypy/trunk/pypy/objspace/std/dictmultiobject.py
   pypy/trunk/pypy/objspace/std/objspace.py
Log:
Get rid of a superfluous argument to __init__. Thanks Amaury for being wary.


Modified: pypy/trunk/pypy/objspace/std/dictmultiobject.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/dictmultiobject.py	(original)
+++ pypy/trunk/pypy/objspace/std/dictmultiobject.py	Wed May 27 14:41:46 2009
@@ -1037,11 +1037,11 @@
 class W_DictMultiObject(W_Object):
     from pypy.objspace.std.dicttype import dict_typedef as typedef
 
-    def __init__(w_self, space, wary=False, sharing=False, module=False):
-        if space.config.objspace.std.withcelldict and wary:
+    def __init__(w_self, space, module=False, sharing=False):
+        if space.config.objspace.std.withcelldict and module:
             from pypy.objspace.std.celldict import ModuleDictImplementation
             w_self.implementation = ModuleDictImplementation(space)
-        elif space.config.objspace.opcodes.CALL_LIKELY_BUILTIN and wary:
+        elif space.config.objspace.opcodes.CALL_LIKELY_BUILTIN and module:
             w_self.implementation = WaryDictImplementation(space)
         elif space.config.objspace.std.withdictmeasurement:
             w_self.implementation = MeasuringDictImplementation(space)

Modified: pypy/trunk/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/objspace.py	(original)
+++ pypy/trunk/pypy/objspace/std/objspace.py	Wed May 27 14:41:46 2009
@@ -592,7 +592,7 @@
     def newdict(self, module=False):
         if self.config.objspace.std.withmultidict and module:
             from pypy.objspace.std.dictmultiobject import W_DictMultiObject
-            return W_DictMultiObject(self, wary=True)
+            return W_DictMultiObject(self, module=True)
         return self.DictObjectCls(self)
 
     def newslice(self, w_start, w_end, w_step):