[pypy-commit] pypy py3k: backout 2fb15b5200b6, this breaks things

[pjenvey]

Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r61388:43790fe331be
Date: 2013-02-17 14:54 -0800
http://bitbucket.org/pypy/pypy/changeset/43790fe331be/

Log:    backout 2fb15b5200b6, this breaks things

diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py
--- a/pypy/interpreter/argument.py
+++ b/pypy/interpreter/argument.py
@@ -508,8 +508,6 @@
                 plural = "s"
             if has_kwarg or num_kwds > 0:
                 msg2 = " non-keyword"
-            elif defcount != -1: # XXX not sure about this
-                msg2 = " positional"
             else:
                 msg2 = ""
             msg = "takes %s %d%s argument%s (%d given)" % (
diff --git a/pypy/interpreter/test/test_argument.py 
b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -698,11 +698,3 @@
         assert e.value.args[0] == "f() got an unexpected keyword argument 
'&#252;'"
         """
 
-    def test_error_positional(self):
-        """
-        def f(a, b=None, *, c=None):
-            pass
-        exc = raises(TypeError, f, 1, 2, 3)
-        expected = "f() takes at most 2 positional arguments (3 given)"
-        assert str(exc.value) == expected
-        """
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit