[pypy-commit] pypy py3.5: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r90248:a56077f0591a
Date: 2017-02-21 10:26 +0100
http://bitbucket.org/pypy/pypy/changeset/a56077f0591a/

Log:	hg merge default

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
@@ -36,7 +36,7 @@
     try:
         cdll = capi.c_load_dictionary(name)
         if not cdll:
-           raise OperationError(space.w_RuntimeError, space.wrap(str("could not load dictionary " + name)))
+           raise OperationError(space.w_RuntimeError, space.newtext(str("could not load dictionary " + name)))
 
     except rdynload.DLOpenError as e:
         if hasattr(space, "fake"):      # FakeSpace fails e.msg (?!)
diff --git a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
--- a/rpython/translator/platform/posix.py
+++ b/rpython/translator/platform/posix.py
@@ -51,11 +51,12 @@
         return ["-Wl,--export-dynamic"]
 
     def _link(self, cc, ofiles, link_args, standalone, exe_name):
-        self._exe_name = str(exe_name)
         args = [str(ofile) for ofile in ofiles] + link_args
         args += ['-o', str(exe_name)]
         if not standalone:
+            self._exe_name = str(exe_name)
             args = self._args_for_shared(args)
+            del self._exe_name      # remove, otherwise __eq__() fails
         self._execute_c_compiler(cc, args, exe_name,
                                  cwd=str(exe_name.dirpath()))
         return exe_name