summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Niemeyer <gustavo@niemeyer.net>2008-03-28 19:48:46 -0300
committerGustavo Niemeyer <gustavo@niemeyer.net>2008-03-28 19:48:46 -0300
commit87e6cf304120f11ff7f163f1a98291682c34b988 (patch)
tree739ac0f5256ec3f2b973be558c8ebf8e8e2d3dfc
parentf21dc94aa7733ebcf5503359c47c97beb458e094 (diff)
downloadmocker-87e6cf304120f11ff7f163f1a98291682c34b988.tar.gz
A couple of changes to better accomodate py3k changes.
-rw-r--r--mocker.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mocker.py b/mocker.py
index bca5160..37e4ddb 100644
--- a/mocker.py
+++ b/mocker.py
@@ -274,7 +274,7 @@ class MockerTestCase(unittest.TestCase):
"""
first_methods = dict(inspect.getmembers(first, inspect.ismethod))
second_methods = dict(inspect.getmembers(second, inspect.ismethod))
- for name, first_method in first_methods.items():
+ for name, first_method in first_methods.iteritems():
first_argspec = inspect.getargspec(first_method)
first_formatted = inspect.formatargspec(*first_argspec)
@@ -1920,7 +1920,7 @@ def global_replace(remove, install):
for referrer in gc.get_referrers(remove):
if (type(referrer) is dict and
referrer.get("__mocker_replace__", True)):
- for key, value in referrer.items():
+ for key, value in list(referrer.iteritems()):
if value is remove:
referrer[key] = install