[pypy-commit] pypy reflex-support: remove now obsolete identity preserving code (the memory regulator

wlav noreply at buildbot.pypy.org
Sat Feb 11 01:37:56 CET 2012


Author: Wim Lavrijsen <WLavrijsen at lbl.gov>
Branch: reflex-support
Changeset: r52362:cfa1fbdbca11
Date: 2012-02-10 11:05 -0800
http://bitbucket.org/pypy/pypy/changeset/cfa1fbdbca11/

Log:	remove now obsolete identity preserving code (the memory regulator
	takes care of it alread)

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
@@ -263,11 +263,7 @@
         for i in range(len(self.functions)):
             cppyyfunc = self.functions[i]
             try:
-                cppresult = cppyyfunc.call(cppthis, w_type, args_w)
-                if cppinstance and isinstance(cppresult, W_CPPInstance):
-                    if cppresult.rawobject == cppinstance.rawobject:
-                        return cppinstance  # recycle object to preserve identity
-                return cppresult
+                return cppyyfunc.call(cppthis, w_type, args_w)
             except OperationError, e:
                 if not (e.match(space, space.w_TypeError) or \
                         e.match(space, space.w_NotImplementedError)):


More information about the pypy-commit mailing list