Author: Armin Rigo <[email protected]>
Branch: string-NUL
Changeset: r51963:c91fe543cd74
Date: 2012-01-30 11:29 +0100
http://bitbucket.org/pypy/pypy/changeset/c91fe543cd74/
Log: Tentative fix
diff --git a/pypy/translator/cli/test/runtest.py
b/pypy/translator/cli/test/runtest.py
--- a/pypy/translator/cli/test/runtest.py
+++ b/pypy/translator/cli/test/runtest.py
@@ -277,10 +277,11 @@
def get_annotation(x):
if isinstance(x, basestring) and len(x) > 1:
result = SomeString()
+ if '\x00' not in x:
+ result.no_nul = True
+ return result
else:
- result = lltype_to_annotation(typeOf(x))
- if isinstance(result, SomeString) and '\x00' not in x:
- result.no_nul = True
+ return lltype_to_annotation(typeOf(x))
class CliTest(BaseRtypingTest, OORtypeMixin):
def __init__(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
