Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r64306:1a50c0638c3d
Date: 2013-05-18 18:22 -0700
http://bitbucket.org/pypy/pypy/changeset/1a50c0638c3d/
Log: kill
diff --git a/pypy/interpreter/test/test_zzpickle_and_slow.py
b/pypy/interpreter/test/test_zzpickle_and_slow.py
--- a/pypy/interpreter/test/test_zzpickle_and_slow.py
+++ b/pypy/interpreter/test/test_zzpickle_and_slow.py
@@ -509,6 +509,22 @@
result = pickle.loads(pckl)
assert pack.mod is result
+ def test_dict_subclass(self):
+ import pickle
+ import sys
+ import types
+ sys.modules['mod'] = mod = types.ModuleType('mod')
+ try:
+ class MyDict(dict):
+ __module__ = 'mod'
+ mod.MyDict = MyDict
+ obj = MyDict()
+ pckl = pickle.dumps(obj)
+ result = pickle.loads(pckl)
+ assert obj == result
+ finally:
+ del sys.modules['mod']
+
class AppTestGeneratorCloning:
diff --git a/pypy/module/oracle/interp_cursor.py
b/pypy/module/oracle/interp_cursor.py
--- a/pypy/module/oracle/interp_cursor.py
+++ b/pypy/module/oracle/interp_cursor.py
@@ -591,7 +591,7 @@
if self.bindDict is None:
self.bindDict = space.newdict()
- items = space.fixedview(space.call_method(w_vars, "iteritems"))
+ items = space.fixedview(space.call_method(w_vars, "items"))
for item in items:
w_key, w_value = space.fixedview(item, 2)
origVar = space.finditem(self.bindDict, w_key)
@@ -670,7 +670,7 @@
var.bind(space, self, None, i + 1)
if self.bindDict:
items_w = space.fixedview(
- space.call_method(self.bindDict, "iteritems"))
+ space.call_method(self.bindDict, "items"))
for w_item in items_w:
w_key, var = space.fixedview(w_item, 2)
assert isinstance(var, interp_variable.W_Variable)
diff --git a/pypy/objspace/std/objecttype.py b/pypy/objspace/std/objecttype.py
--- a/pypy/objspace/std/objecttype.py
+++ b/pypy/objspace/std/objecttype.py
@@ -168,7 +168,7 @@
listitems = None
if isinstance(obj, dict):
- dictitems = obj.iteritems()
+ dictitems = iter(obj.items())
else:
dictitems = None
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
