Author: Ronan Lamy <[email protected]>
Branch: py3.6
Changeset: r97999:1843e911ad01
Date: 2019-11-09 02:21 +0000
http://bitbucket.org/pypy/pypy/changeset/1843e911ad01/
Log: Convert test_exec to apptest
diff --git a/pypy/interpreter/test/test_exec.py
b/pypy/interpreter/test/apptest_exec.py
rename from pypy/interpreter/test/test_exec.py
rename to pypy/interpreter/test/apptest_exec.py
--- a/pypy/interpreter/test/test_exec.py
+++ b/pypy/interpreter/test/apptest_exec.py
@@ -2,208 +2,203 @@
New for PyPy - Could be incorporated into CPython regression tests.
"""
-from rpython.tool.udir import udir
+def test_string():
+ g = {}
+ l = {}
+ exec("a = 3", g, l)
+ assert l['a'] == 3
+def test_localfill():
+ g = {}
+ exec("a = 3", g)
+ assert g['a'] == 3
-class AppTestExecStmt:
+def test_builtinsupply():
+ g = {}
+ exec("pass", g)
+ assert '__builtins__' in g
- def test_string(self):
- g = {}
- l = {}
- exec("a = 3", g, l)
- assert l['a'] == 3
+def test_invalidglobal():
+ def f():
+ exec('pass', 1)
+ raises(TypeError, f)
- def test_localfill(self):
- g = {}
- exec("a = 3", g)
- assert g['a'] == 3
+def test_invalidlocal():
+ def f():
+ exec('pass', {}, 2)
+ raises(TypeError, f)
- def test_builtinsupply(self):
- g = {}
- exec("pass", g)
- assert '__builtins__' in g
+def test_codeobject():
+ co = compile("a = 3", '<string>', 'exec')
+ g = {}
+ l = {}
+ exec(co, g, l)
+ assert l['a'] == 3
- def test_invalidglobal(self):
+def test_implicit():
+ a = 4
+ exec("a = 3")
+ assert a == 3
+
+def test_tuplelocals():
+ g = {}
+ l = {}
+ exec("a = 3", g, l)
+ assert l['a'] == 3
+
+def test_tupleglobals():
+ g = {}
+ exec("a = 3", g)
+ assert g['a'] == 3
+
+def test_exceptionfallthrough():
+ def f():
+ exec('raise TypeError', {})
+ raises(TypeError, f)
+
+def test_global_stmt():
+ g = {}
+ l = {}
+ co = compile("global a; a=5", '', 'exec')
+ #import dis
+ #dis.dis(co)
+ exec(co, g, l)
+ assert l == {}
+ assert g['a'] == 5
+
+def test_specialcase_free_load():
+ exec("""if 1:
def f():
- exec('pass', 1)
- raises(TypeError, f)
+ exec('a=3')
+ return a
+ raises(NameError, f)\n""")
- def test_invalidlocal(self):
+def test_specialcase_free_load2():
+ exec("""if 1:
+ def f(a):
+ exec('a=3')
+ return a
+ x = f(4)\n""")
+ assert eval("x") == 3
+
+def test_nested_names_are_not_confused():
+ def get_nested_class():
+ method_and_var = "var"
+ class Test(object):
+ def method_and_var(self):
+ return "method"
+ def test(self):
+ return method_and_var
+ def actual_global(self):
+ return str("global")
+ def str(self):
+ return str(self)
+ return Test()
+ t = get_nested_class()
+ assert t.actual_global() == "global"
+ assert t.test() == 'var'
+ assert t.method_and_var() == 'method'
+
+def test_exec_load_name():
+ d = {'x': 2}
+ exec("""if 1:
def f():
- exec('pass', {}, 2)
- raises(TypeError, f)
+ save = x
+ exec("x=3")
+ return x,save
+ \n""", d)
+ res = d['f']()
+ assert res == (2, 2)
- def test_codeobject(self):
- co = compile("a = 3", '<string>', 'exec')
- g = {}
- l = {}
- exec(co, g, l)
- assert l['a'] == 3
+def test_space_bug():
+ d = {}
+ exec("x=5 ", d)
+ assert d['x'] == 5
- def test_implicit(self):
- a = 4
- exec("a = 3")
- assert a == 3
+def test_synerr():
+ def x():
+ exec("1 2")
+ raises(SyntaxError, x)
- def test_tuplelocals(self):
- g = {}
- l = {}
- exec("a = 3", g, l)
- assert l['a'] == 3
+def test_mapping_as_locals():
+ class M(object):
+ def __getitem__(self, key):
+ return key
+ def __setitem__(self, key, value):
+ self.result[key] = value
+ def setdefault(self, key, value):
+ assert key == '__builtins__'
+ m = M()
+ m.result = {}
+ exec("x=m", {}, m)
+ assert m.result == {'x': 'm'}
+ try:
+ exec("y=n", m)
+ except TypeError:
+ pass
+ else:
+ assert False, 'Expected TypeError'
+ raises(TypeError, eval, "m", m)
- def test_tupleglobals(self):
- g = {}
- exec("a = 3", g)
- assert g['a'] == 3
+def test_filename():
+ try:
+ exec("'unmatched_quote")
+ except SyntaxError as msg:
+ assert msg.filename == '<string>'
+ try:
+ eval("'unmatched_quote")
+ except SyntaxError as msg:
+ assert msg.filename == '<string>'
- def test_exceptionfallthrough(self):
- def f():
- exec('raise TypeError', {})
- raises(TypeError, f)
+def test_exec_and_name_lookups():
+ ns = {}
+ exec("""def f():
+ exec('x=1', globals())
+ return x\n""", ns)
- def test_global_stmt(self):
- g = {}
- l = {}
- co = compile("global a; a=5", '', 'exec')
- #import dis
- #dis.dis(co)
- exec(co, g, l)
- assert l == {}
- assert g['a'] == 5
+ f = ns['f']
- def test_specialcase_free_load(self):
- exec("""if 1:
- def f():
- exec('a=3')
- return a
- raises(NameError, f)\n""")
+ try:
+ res = f()
+ except NameError as e: # keep py.test from exploding confused
+ raise e
- def test_specialcase_free_load2(self):
- exec("""if 1:
- def f(a):
- exec('a=3')
- return a
- x = f(4)\n""")
- assert eval("x") == 3
+ assert res == 1
- def test_nested_names_are_not_confused(self):
- def get_nested_class():
- method_and_var = "var"
- class Test(object):
- def method_and_var(self):
- return "method"
- def test(self):
- return method_and_var
- def actual_global(self):
- return str("global")
- def str(self):
- return str(self)
- return Test()
- t = get_nested_class()
- assert t.actual_global() == "global"
- assert t.test() == 'var'
- assert t.method_and_var() == 'method'
+def test_exec_unicode():
+ # 's' is a bytes string
+ s = b"x = '\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd'"
+ # 'u' is a unicode
+ u = s.decode('utf-8')
+ ns = {}
+ exec(u, ns)
+ x = ns['x']
+ assert len(x) == 6
+ assert ord(x[0]) == 0x0439
+ assert ord(x[1]) == 0x0446
+ assert ord(x[2]) == 0x0443
+ assert ord(x[3]) == 0x043a
+ assert ord(x[4]) == 0x0435
+ assert ord(x[5]) == 0x043d
- def test_exec_load_name(self):
- d = {'x': 2}
- exec("""if 1:
- def f():
- save = x
- exec("x=3")
- return x,save
- \n""", d)
- res = d['f']()
- assert res == (2, 2)
+def test_eval_unicode():
+ u = "'%s'" % chr(0x1234)
+ v = eval(u)
+ assert v == chr(0x1234)
- def test_space_bug(self):
- d = {}
- exec("x=5 ", d)
- assert d['x'] == 5
+def test_compile_bytes():
+ s = b"x = '\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd'"
+ c = compile(s, '<input>', 'exec')
+ ns = {}
+ exec(c, ns)
+ x = ns['x']
+ assert len(x) == 6
+ assert ord(x[0]) == 0x0439
- def test_synerr(self):
- def x():
- exec("1 2")
- raises(SyntaxError, x)
-
- def test_mapping_as_locals(self):
- class M(object):
- def __getitem__(self, key):
- return key
- def __setitem__(self, key, value):
- self.result[key] = value
- def setdefault(self, key, value):
- assert key == '__builtins__'
- m = M()
- m.result = {}
- exec("x=m", {}, m)
- assert m.result == {'x': 'm'}
- try:
- exec("y=n", m)
- except TypeError:
- pass
- else:
- assert False, 'Expected TypeError'
- raises(TypeError, eval, "m", m)
-
- def test_filename(self):
- try:
- exec("'unmatched_quote")
- except SyntaxError as msg:
- assert msg.filename == '<string>'
- try:
- eval("'unmatched_quote")
- except SyntaxError as msg:
- assert msg.filename == '<string>'
-
- def test_exec_and_name_lookups(self):
- ns = {}
- exec("""def f():
- exec('x=1', globals())
- return x\n""", ns)
-
- f = ns['f']
-
- try:
- res = f()
- except NameError as e: # keep py.test from exploding confused
- raise e
-
- assert res == 1
-
- def test_exec_unicode(self):
- # 's' is a bytes string
- s = b"x = '\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd'"
- # 'u' is a unicode
- u = s.decode('utf-8')
- ns = {}
- exec(u, ns)
- x = ns['x']
- assert len(x) == 6
- assert ord(x[0]) == 0x0439
- assert ord(x[1]) == 0x0446
- assert ord(x[2]) == 0x0443
- assert ord(x[3]) == 0x043a
- assert ord(x[4]) == 0x0435
- assert ord(x[5]) == 0x043d
-
- def test_eval_unicode(self):
- u = "'%s'" % chr(0x1234)
- v = eval(u)
- assert v == chr(0x1234)
-
- def test_compile_bytes(self):
- s = b"x = '\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd'"
- c = compile(s, '<input>', 'exec')
- ns = {}
- exec(c, ns)
- x = ns['x']
- assert len(x) == 6
- assert ord(x[0]) == 0x0439
-
- def test_issue3297(self):
- c = compile("a, b = '\U0001010F', '\\U0001010F'", "dummy", "exec")
- d = {}
- exec(c, d)
- assert d['a'] == d['b']
- assert len(d['a']) == len(d['b'])
- assert ascii(d['a']) == ascii(d['b'])
+def test_issue3297():
+ c = compile("a, b = '\U0001010F', '\\U0001010F'", "dummy", "exec")
+ d = {}
+ exec(c, d)
+ assert d['a'] == d['b']
+ assert len(d['a']) == len(d['b'])
+ assert ascii(d['a']) == ascii(d['b'])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
