Author: Wim Lavrijsen <wlavrij...@lbl.gov>
Branch: reflex-support
Changeset: r44263:b53fddb460b3
Date: 2011-05-16 17:05 -0700
http://bitbucket.org/pypy/pypy/changeset/b53fddb460b3/
Log: RPython and pylint 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
@@ -15,7 +15,6 @@
def get_rawobject(space, w_obj):
if w_obj:
- 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
@@ -87,9 +86,9 @@
class PtrTypeConverter(ArrayTypeConverter):
def _get_raw_address(self, space, w_obj, offset):
- fieldptr = TypeConverter._get_raw_address(self, space, w_obj, offset)
- ptrptr = rffi.cast(rffi.LONGP, fieldptr)
- return ptrptr[0]
+ address = TypeConverter._get_raw_address(self, space, w_obj, offset)
+ ptr2ptr = rffi.cast(rffi.LONGP, address)
+ return rffi.cast(rffi.CCHARP, ptr2ptr[0])
class VoidConverter(TypeConverter):
@@ -127,9 +126,9 @@
raise OperationError(space.w_TypeError,
space.wrap("boolean value should be bool, or
integer 1 or 0"))
if arg:
- address[0] = '\x01'
+ address[0] = '\x01'
else:
- address[0] = '\x00'
+ address[0] = '\x00'
class CharConverter(TypeConverter):
_immutable = True
@@ -191,7 +190,7 @@
longptr = rffi.cast(rffi.LONGP, address)
longptr[0] = space.c_int_w(w_value)
-class UnsignedLongConverter(LongConverter):
+class UnsignedLongConverter(TypeConverter):
_immutable = True
libffitype = libffi.types.ulong
diff --git a/pypy/module/cppyy/interp_cppyy.py
b/pypy/module/cppyy/interp_cppyy.py
--- a/pypy/module/cppyy/interp_cppyy.py
+++ b/pypy/module/cppyy/interp_cppyy.py
@@ -248,14 +248,14 @@
self.offset = offset
def is_static(self):
- return self.space.wrap(False)
+ return self.space.w_False
def __get__(self, args_w):
return self.converter.from_memory(self.space, args_w[0], self.offset)
def __set__(self, args_w):
self.converter.to_memory(self.space, args_w[0], args_w[1], self.offset)
- return None
+ return self.space.w_None
W_CPPDataMember.typedef = TypeDef(
'CPPDataMember',
@@ -267,14 +267,14 @@
class W_CPPStaticDataMember(W_CPPDataMember):
def is_static(self):
- return self.space.wrap(True)
+ return self.space.w_True
def __get__(self, args_w):
return self.converter.from_memory(self.space, self.space.w_None,
self.offset)
def __set__(self, args_w):
self.converter.to_memory(self.space, self.space.w_None, args_w[1],
self.offset)
- return None
+ return self.space.w_None
W_CPPStaticDataMember.typedef = TypeDef(
'CPPStaticDataMember',
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
