Maciej Fijalkowski avatar Maciej Fijalkowski committed 97733fc

resolve conflict

Comments (0)

Files changed (1)

pypy/objspace/std/dictmultiobject.py

     def w_keys(self, w_dict):
         return self.space.newlist_str(self.listview_str(w_dict))
 
-<<<<<<< local
     def wrapkey(space, key):
         return space.wrap(key)
-=======
+
     @jit.look_inside_iff(lambda self, w_dict:
                          w_dict_unrolling_heuristic(w_dict))
     def view_as_kwargs(self, w_dict):
             values[i] = val
             i += 1
         return keys, values
->>>>>>> other
-
-    def view_as_kwargs(self, w_dict):
-        d = self.unerase(w_dict.dstorage)
-        l = len(d)
-        keys, values = [None] * l, [None] * l
-        i = 0
-        for key, val in d.iteritems():
-            keys[i] = key
-            values[i] = val
-            i += 1
-        return keys, values
 
 create_itertor_classes(StringDictStrategy)
 
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.