Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r51874:59514c43c5c0
Date: 2012-01-27 12:08 +0100
http://bitbucket.org/pypy/pypy/changeset/59514c43c5c0/
Log: fix the syntax of exception clauses. Now all applevel tests pass
with --appdirect=/usr/bin/python3
diff --git a/pypy/interpreter/test/test_syntax.py
b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -611,7 +611,7 @@
line4 = "if ?: pass\n"
try:
exec("print\nprint\nprint\n" + line4)
- except SyntaxError, e:
+ except SyntaxError as e:
assert e.lineno == 4
assert e.text == line4
assert e.offset == e.text.index('?') + 1
@@ -626,10 +626,11 @@
a b c d e
bar
""")
- except SyntaxError, e:
+ except SyntaxError as e:
assert e.lineno == 4
assert e.text.endswith('a b c d e\n')
- assert e.offset == e.text.index('b')
+ b_pos = e.text.index('b')
+ assert e.offset in (b_pos, b_pos+1) # b_pos in pypy, b_pos+1 in
CPython.
else:
raise Exception("no SyntaxError??")
@@ -637,19 +638,20 @@
program = "(1, 2) += (3, 4)\n"
try:
exec(program)
- except SyntaxError, e:
+ except SyntaxError as e:
assert e.lineno == 1
assert e.text is None
else:
raise Exception("no SyntaxError??")
def test_bad_encoding(self):
+ '''
program = """
# -*- coding: uft-8 -*-
pass
"""
- raises(SyntaxError, "exec(program)")
-
+ raises(SyntaxError, exec, program)
+ '''
if __name__ == '__main__':
# only to check on top of CPython (you need 2.4)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
