Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r47604:f0988800117b
Date: 2011-09-26 06:36 -0400
http://bitbucket.org/pypy/pypy/changeset/f0988800117b/
Log: fix functools tests
diff --git a/lib_pypy/_functools.py b/lib_pypy/_functools.py
--- a/lib_pypy/_functools.py
+++ b/lib_pypy/_functools.py
@@ -18,5 +18,5 @@
def __call__(self, *fargs, **fkeywords):
if self.keywords is not None:
- fkeywords.update(self.keywords)
+ fkeywords = dict(self.keywords, **fkeywords)
return self.func(*(self.args + fargs), **fkeywords)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
