Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r70886:4cedca9c5099
Date: 2014-04-23 02:47 -0400
http://bitbucket.org/pypy/pypy/changeset/4cedca9c5099/
Log: simplify
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
@@ -6,7 +6,7 @@
from rpython.rlib.rarithmetic import r_singlefloat
from rpython.rlib import jit_libffi, rfloat
-from pypy.module._rawffi.interp_rawffi import unpack_simple_shape
+from pypy.module._rawffi.interp_rawffi import letter2tp
from pypy.module._rawffi.array import W_Array, W_ArrayInstance
from pypy.module.cppyy import helper, capi, ffitypes
@@ -132,7 +132,7 @@
def __getattr__(self, name):
if name.startswith('array_'):
typecode = name[len('array_'):]
- arr = self.space.interp_w(W_Array, unpack_simple_shape(self.space,
self.space.wrap(typecode)))
+ arr = self.space.interp_w(W_Array, letter2tp(self.space, typecode))
setattr(self, name, arr)
return arr
raise AttributeError(name)
@@ -409,7 +409,7 @@
if ptrval == 0:
from pypy.module.cppyy import interp_cppyy
return interp_cppyy.get_nullptr(space)
- arr = space.interp_w(W_Array, unpack_simple_shape(space,
space.wrap('P')))
+ arr = space.interp_w(W_Array, letter2tp(space, 'P'))
return arr.fromaddress(space, ptrval, sys.maxint)
def to_memory(self, space, w_obj, w_value, offset):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
