Author: Wim Lavrijsen <[email protected]>
Branch: reflex-support
Changeset: r55842:290ad095b78e
Date: 2012-06-25 17:54 -0700
http://bitbucket.org/pypy/pypy/changeset/290ad095b78e/
Log: indentation 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
@@ -646,13 +646,13 @@
def _unwrap_object(self, space, w_obj):
try:
- charp = rffi.str2charp(space.str_w(w_obj))
- arg = capi.c_charp2stdstring(charp)
- rffi.free_charp(charp)
- return arg
+ charp = rffi.str2charp(space.str_w(w_obj))
+ arg = capi.c_charp2stdstring(charp)
+ rffi.free_charp(charp)
+ return arg
except OperationError:
- arg = InstanceConverter._unwrap_object(self, space, w_obj)
- return capi.c_stdstring2stdstring(arg)
+ arg = InstanceConverter._unwrap_object(self, space, w_obj)
+ return capi.c_stdstring2stdstring(arg)
def to_memory(self, space, w_obj, w_value, offset):
try:
@@ -687,7 +687,7 @@
from pypy.module.cpyext.pyobject import make_ref
ref = make_ref(space, w_obj)
x = rffi.cast(rffi.VOIDPP, address)
- x[0] = rffi.cast(rffi.VOIDP, ref);
+ x[0] = rffi.cast(rffi.VOIDP, ref)
ba = rffi.cast(rffi.CCHARP, address)
ba[capi.c_function_arg_typeoffset()] = 'a'
diff --git a/pypy/module/cppyy/helper.py b/pypy/module/cppyy/helper.py
--- a/pypy/module/cppyy/helper.py
+++ b/pypy/module/cppyy/helper.py
@@ -43,7 +43,7 @@
if name.endswith("]"): # array type?
idx = name.rfind("[")
if 0 < idx:
- name = name[:idx]
+ name = name[:idx]
elif name.endswith(">"): # template type?
idx = name.find("<")
if 0 < idx: # always true, but just so that the translater knows
@@ -90,10 +90,10 @@
return nargs and "__sub__" or "__neg__"
if op == "++": # prefix v.s. postfix increment (not python)
- return nargs and "__postinc__" or "__preinc__";
+ return nargs and "__postinc__" or "__preinc__"
if op == "--": # prefix v.s. postfix decrement (not python)
- return nargs and "__postdec__" or "__predec__";
+ return nargs and "__postdec__" or "__predec__"
# operator could have been a conversion using a typedef (this lookup
# is put at the end only as it is unlikely and may trigger unwanted
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
@@ -802,8 +802,8 @@
@unwrap_spec(cppinstance=W_CPPInstance)
def addressof(space, cppinstance):
- address = rffi.cast(rffi.LONG, cppinstance.get_rawobject())
- return space.wrap(address)
+ address = rffi.cast(rffi.LONG, cppinstance.get_rawobject())
+ return space.wrap(address)
@unwrap_spec(address=int, owns=bool)
def bind_object(space, address, w_pycppclass, owns=False):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
