[pypy-commit] pypy py3.5: Show only value of unicodeobject in case of non-empty intersection

[raffael_t]

Author: Raffael Tfirst <raffael.tfirst at gmail.com>
Branch: py3.5
Changeset: r85502:53b6c2e3609c
Date: 2016-07-01 19:59 +0200
http://bitbucket.org/pypy/pypy/changeset/53b6c2e3609c/

Log:	Show only value of unicodeobject in case of non-empty intersection

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -1363,7 +1363,7 @@
                 (w_key, w_value) = w_item.popitem()
                 if self.space.is_true(self.space.contains(w_dict,w_key)):
                     raise oefmt(self.space.w_TypeError,
-                        "got multiple values for keyword argument %s", w_key)
+                        "got multiple values for keyword argument %s", self.space.unicode_w(w_key))
                 self.space.setitem(w_dict, w_key, w_value)
         while num_maps != 0:
             self.popvalue()