Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: space-newtext
Changeset: r89092:342d364c012a
Date: 2016-12-16 11:39 +0100
http://bitbucket.org/pypy/pypy/changeset/342d364c012a/
Log: remove some new wraps
diff --git a/pypy/module/cppyy/capi/loadable_capi.py
b/pypy/module/cppyy/capi/loadable_capi.py
--- a/pypy/module/cppyy/capi/loadable_capi.py
+++ b/pypy/module/cppyy/capi/loadable_capi.py
@@ -601,7 +601,7 @@
from pypy.module.cppyy import interp_cppyy
cppstr = space.interp_w(interp_cppyy.W_CPPInstance, w_self,
can_be_None=False)
- return space.wrap(c_stdstring2charp(space, cppstr._rawobject))
+ return space.newtext(c_stdstring2charp(space, cppstr._rawobject))
# setup pythonizations for later use at run-time
_pythonizations = {}
@@ -616,14 +616,14 @@
]
for f in allfuncs:
- _pythonizations[f.__name__] = space.wrap(interp2app(f))
+ _pythonizations[f.__name__] = interp2app(f).spacebind(space)
def _method_alias(space, w_pycppclass, m1, m2):
- space.setattr(w_pycppclass, space.wrap(m1),
- space.getattr(w_pycppclass, space.wrap(m2)))
+ space.setattr(w_pycppclass, space.newtext(m1),
+ space.getattr(w_pycppclass, space.newtext(m2)))
def pythonize(space, name, w_pycppclass):
if name == "string":
- space.setattr(w_pycppclass, space.wrap("c_str"),
_pythonizations["stdstring_c_str"])
+ space.setattr(w_pycppclass, space.newtext("c_str"),
_pythonizations["stdstring_c_str"])
_method_alias(space, w_pycppclass, "_cppyy_as_builtin", "c_str")
_method_alias(space, w_pycppclass, "__str__", "c_str")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
