Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r76777:a8e0fff6383f
Date: 2015-04-12 13:38 +0100
http://bitbucket.org/pypy/pypy/changeset/a8e0fff6383f/
Log: Merged issue2018 into default
Fixes #2018
diff --git a/rpython/rtyper/lltypesystem/test/test_lltype.py
b/rpython/rtyper/lltypesystem/test/test_lltype.py
--- a/rpython/rtyper/lltypesystem/test/test_lltype.py
+++ b/rpython/rtyper/lltypesystem/test/test_lltype.py
@@ -547,10 +547,10 @@
@py.test.mark.parametrize('x', [
1, sys.maxint, 1.5, 'a', 'abc', u'abc', None, [],
- py.test.mark.xfail(lambda: None),
+ lambda: None,
{1.23: 'abc'},
(1, 'x', [2, 3.],),
- py.test.mark.xfail(Frozen()),])
+ Frozen(),])
def test_typeOf_const(x):
a = RPythonAnnotator()
bk = a.bookkeeper
diff --git a/rpython/rtyper/rpbc.py b/rpython/rtyper/rpbc.py
--- a/rpython/rtyper/rpbc.py
+++ b/rpython/rtyper/rpbc.py
@@ -383,6 +383,9 @@
assert frozendesc is self.frozendesc
return object() # lowleveltype is Void
+ def convert_const(self, value):
+ return None
+
def getstr(self):
return str(self.frozendesc)
getstr._annspecialcase_ = 'specialize:memo'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
