[pypy-commit] pypy speedup-unpackiterable: resolve conflict

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: speedup-unpackiterable
Changeset: r56295:97733fcb6b67
Date: 2012-07-20 18:53 +0200
http://bitbucket.org/pypy/pypy/changeset/97733fcb6b67/

Log:	resolve conflict

diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -604,10 +604,9 @@
     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):
@@ -620,18 +619,6 @@
             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)