Author: Armin Rigo <ar...@tunes.org>
Branch: py3.6
Changeset: r98577:be4941bb07ae
Date: 2020-01-23 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/be4941bb07ae/
Log: hg merge default
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
@@ -823,12 +823,12 @@
# does not contain the warning about missing self
assert exc.value.args[0] == "f0() takes 0 positional arguments but 1
was given"
- @pytest.mark.pypy_only
def test_error_message_module_function(self):
import operator # use countOf because it's defined at applevel
exc = raises(TypeError, lambda : operator.countOf(1, 2, 3))
- # does not contain the warning about missing self
- assert exc.value.args[0] == "countOf() takes 2 positional arguments
but 3 were given"
+ # does not contain the warning
+ # 'Did you forget 'self' in the function definition?'
+ assert 'self' not in str(exc.value)
@pytest.mark.pypy_only
def test_error_message_bound_method(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
