Author: Wim Lavrijsen <wlavrij...@lbl.gov>
Branch: reflex-support
Changeset: r44264:249cfd1d8127
Date: 2011-05-17 13:22 -0700
http://bitbucket.org/pypy/pypy/changeset/249cfd1d8127/
Log: rpython fixes
diff --git a/pypy/module/cppyy/converter.py b/pypy/module/cppyy/converter.py
--- a/pypy/module/cppyy/converter.py
+++ b/pypy/module/cppyy/converter.py
@@ -14,10 +14,12 @@
_converters = {}
def get_rawobject(space, w_obj):
- if w_obj:
+ if not space.eq_w(w_obj, space.w_None):
+ from pypy.module.cppyy.interp_cppyy import W_CPPInstance
w_cpp_instance = space.findattr(w_obj, space.wrap("_cppinstance"))
- if w_cpp_instance:
- return w_cpp_instance.rawobject
+ cpp_instance = space.interp_w(W_CPPInstance, w_cpp_instance,
can_be_None=True)
+ if cpp_instance:
+ return cpp_instance.rawobject
return lltype.nullptr(rffi.CCHARP.TO)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
