Brian Kearns avatar Brian Kearns committed 7532082

backout 60b3f3d002ba to test if it caused the performance regression in genshi_text/xml

Comments (0)

Files changed (3)

pypy/interpreter/eval.py

     def exec_code(self, space, w_globals, w_locals):
         "Implements the 'exec' statement."
         # this should be on PyCode?
-        space.possibly_convert_to_celldict(w_globals)
         frame = space.createframe(self, w_globals, None)
         frame.setdictscope(w_locals)
         return frame.run()

pypy/objspace/std/dictmultiobject.py

     def view_as_kwargs(self):
         return self.strategy.view_as_kwargs(self)
 
-    def convert_to_celldict_strategy(self, space):
-        from pypy.objspace.std.celldict import ModuleDictStrategy
-        
-        if isinstance(self.strategy, ModuleDictStrategy):
-            return
-        items_w = self.items()
-        self.strategy = ModuleDictStrategy(space)
-        self.dstorage = self.strategy.get_empty_storage()
-        for w_tup in items_w:
-            w_key, w_val = space.fixedview(w_tup, 2)
-            self.setitem(w_key, w_val)
-
 def _add_indirections():
     dict_methods = "setitem setitem_str getitem \
                     getitem_str delitem length \

pypy/objspace/std/objspace.py

         if not hasattr(self, "_interplevel_classes"):
             return None # before running initialize
         return self._interplevel_classes.get(w_type, None)
-
-    def possibly_convert_to_celldict(self, w_dict):
-        """ Converts the dict to celldict, if it's a dict, otherwise
-        leaves it alone
-        """
-        if isinstance(w_dict, W_DictMultiObject):
-            w_dict.convert_to_celldict_strategy(self)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.