Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3.6
Changeset: r95538:d510a67badcd
Date: 2018-12-30 03:41 +0100
http://bitbucket.org/pypy/pypy/changeset/d510a67badcd/

Log:    Fix some doctests: PyPy does not add the function name to the error
        message, and one exception was wrong.

diff --git a/lib-python/3/test/test_unpack_ex.py 
b/lib-python/3/test/test_unpack_ex.py
--- a/lib-python/3/test/test_unpack_ex.py
+++ b/lib-python/3/test/test_unpack_ex.py
@@ -244,16 +244,16 @@
       ...
     TypeError: ...got multiple values for keyword argument 'x'
 
-    >>> f(x=5, **{'x': 3}, **{'x': 2})
-    Traceback (most recent call last):
-      ...
-    TypeError: f() got multiple values for keyword argument 'x'
-
-    >>> f(**{1: 3}, **{1: 5})
+    >>> f(x=5, **{'x': 3}, **{'x': 2})     # doctest:+ELLIPSIS
     Traceback (most recent call last):
       ...
     TypeError: ...got multiple values for keyword argument 'x'
 
+    >>> f(**{1: 3}, **{1: 5})     # doctest:+ELLIPSIS
+    Traceback (most recent call last):
+      ...
+    TypeError: ...keywords must be strings...
+
     >>> f(x=5, **{'x': 3}, **{'x': 2})     # doctest:+ELLIPSIS
     Traceback (most recent call last):
       ...
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to