Author: Armin Rigo <[email protected]>
Branch: string-NUL
Changeset: r52084:d725dfbdab1c
Date: 2012-02-04 13:23 +0100
http://bitbucket.org/pypy/pypy/changeset/d725dfbdab1c/
Log: Fixes.
diff --git a/pypy/translator/c/test/test_extfunc.py
b/pypy/translator/c/test/test_extfunc.py
--- a/pypy/translator/c/test/test_extfunc.py
+++ b/pypy/translator/c/test/test_extfunc.py
@@ -146,7 +146,7 @@
filename = str(py.path.local(__file__))
def call_access(path, mode):
return os.access(path, mode)
- f = compile(call_access, [str, int])
+ f = compile(call_access, [annmodel.s_Str0, int])
for mode in os.R_OK, os.W_OK, os.X_OK, (os.R_OK | os.W_OK | os.X_OK):
assert f(filename, mode) == os.access(filename, mode)
@@ -226,7 +226,7 @@
def test_system():
def does_stuff(cmd):
return os.system(cmd)
- f1 = compile(does_stuff, [str])
+ f1 = compile(does_stuff, [annmodel.s_Str0])
res = f1("echo hello")
assert res == 0
@@ -312,7 +312,7 @@
def test_chdir():
def does_stuff(path):
os.chdir(path)
- f1 = compile(does_stuff, [str])
+ f1 = compile(does_stuff, [annmodel.s_Str0])
curdir = os.getcwd()
try:
os.chdir('..')
@@ -629,7 +629,7 @@
return os.environ[s]
except KeyError:
return '--missing--'
- func = compile(fn, [str])
+ func = compile(fn, [annmodel.s_Str0])
os.environ.setdefault('USER', 'UNNAMED_USER')
result = func('USER')
assert result == os.environ['USER']
@@ -641,7 +641,7 @@
res = os.environ.get(s)
if res is None: res = '--missing--'
return res
- func = compile(fn, [str])
+ func = compile(fn, [annmodel.s_Str0])
os.environ.setdefault('USER', 'UNNAMED_USER')
result = func('USER')
assert result == os.environ['USER']
@@ -655,7 +655,7 @@
os.environ[s] = t3
os.environ[s] = t4
os.environ[s] = t5
- func = compile(fn, [str, str, str, str, str, str])
+ func = compile(fn, [annmodel.s_Str0] * 6)
func('PYPY_TEST_DICTLIKE_ENVIRON', 'a', 'b', 'c', 'FOOBAR', '42',
expected_extra_mallocs = (2, 3, 4)) # at least two, less than 5
assert _real_getenv('PYPY_TEST_DICTLIKE_ENVIRON') == '42'
@@ -679,7 +679,7 @@
else:
raise Exception("should have raised!")
# os.environ[s5] stays
- func = compile(fn, [str, str, str, str, str])
+ func = compile(fn, [annmodel.s_Str0] * 5)
if hasattr(__import__(os.name), 'unsetenv'):
expected_extra_mallocs = range(2, 10)
# at least 2, less than 10: memory for s1, s2, s3, s4 should be freed
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
