[pypy-svn] r29914 - pypy/branch/objspace-config-cleanup/pypy/objspace/std

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Jul 10 09:54:47 2006
New Revision: 29914

Modified:
   pypy/branch/objspace-config-cleanup/pypy/objspace/std/dicttype.py
Log:
fix another leftover direct mention of one of the dict impls


Modified: pypy/branch/objspace-config-cleanup/pypy/objspace/std/dicttype.py
==============================================================================
--- pypy/branch/objspace-config-cleanup/pypy/objspace/std/dicttype.py	(original)
+++ pypy/branch/objspace-config-cleanup/pypy/objspace/std/dicttype.py	Mon Jul 10 09:54:47 2006
@@ -164,8 +164,12 @@
     a registration with copy_reg, instead.
     """
     from pypy.interpreter.mixedmodule import MixedModule
-    from pypy.objspace.std.dictobject import \
-         W_DictIter_Keys, W_DictIter_Values, W_DictIter_Items
+    if space.config.objspace.std.withdictstr:
+        from pypy.objspace.std.dictobject import \
+             W_DictIter_Keys, W_DictIter_Values, W_DictIter_Items
+    else:
+        from pypy.objspace.std.dictobject import \
+             W_DictIter_Keys, W_DictIter_Values, W_DictIter_Items
     w_mod    = space.getbuiltinmodule('_pickle_support')
     mod      = space.interp_w(MixedModule, w_mod)
     new_inst = mod.get('dictiter_surrogate_new')