Author: Armin Rigo <[email protected]>
Branch:
Changeset: r46855:f17803f41ee7
Date: 2011-08-28 09:14 +0000
http://bitbucket.org/pypy/pypy/changeset/f17803f41ee7/
Log: merge heads
diff --git a/pypy/objspace/std/test/test_celldict.py
b/pypy/objspace/std/test/test_celldict.py
--- a/pypy/objspace/std/test/test_celldict.py
+++ b/pypy/objspace/std/test/test_celldict.py
@@ -6,8 +6,6 @@
BaseTestRDictImplementation, BaseTestDevolvedDictImplementation
from pypy.interpreter import gateway
-from pypy.conftest import gettestobjspace, option
-
space = FakeSpace()
class TestCellDict(object):
@@ -44,10 +42,11 @@
class AppTestModuleDict(object):
def setup_class(cls):
cls.space = gettestobjspace(**{"objspace.std.withcelldict": True})
+ cls.w_runappdirect = cls.space.wrap(option.runappdirect)
def w_impl_used(self, obj):
- if option.runappdirect:
- py.test.skip("__repr__ doesn't work on appdirect")
+ if self.runappdirect:
+ skip("__repr__ doesn't work on appdirect")
import __pypy__
assert "ModuleDictStrategy" in __pypy__.internal_repr(obj)
diff --git a/pypy/rpython/lltypesystem/rffi.py
b/pypy/rpython/lltypesystem/rffi.py
--- a/pypy/rpython/lltypesystem/rffi.py
+++ b/pypy/rpython/lltypesystem/rffi.py
@@ -870,7 +870,7 @@
if size is None:
size = llmemory.sizeof(tp) # a symbolic result in this case
return size
- if isinstance(tp, lltype.Ptr):
+ if isinstance(tp, lltype.Ptr) or tp is llmemory.Address:
tp = ULONG # XXX!
if tp is lltype.Char or tp is lltype.Bool:
return 1
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
