[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r92649:aedd9ba91c12
Date: 2017-10-08 08:22 +0200
http://bitbucket.org/pypy/pypy/changeset/aedd9ba91c12/

Log:	merge heads

diff --git a/pypy/module/_cppyy/test/conftest.py b/pypy/module/_cppyy/test/conftest.py
--- a/pypy/module/_cppyy/test/conftest.py
+++ b/pypy/module/_cppyy/test/conftest.py
@@ -4,7 +4,7 @@
 def pytest_runtest_setup(item):
     if py.path.local.sysfind('genreflex') is None:
         import pypy.module._cppyy.capi.loadable_capi as lcapi
-        if 'dummy' in lcapi.reflection_library:
+        if 'dummy' in lcapi.backend_library:
             # run only tests that are covered by the dummy backend and tests
             # that do not rely on reflex
             import os
@@ -33,7 +33,7 @@
         import pypy.module._cppyy.capi.loadable_capi as lcapi
         try:
             import ctypes
-            ctypes.CDLL(lcapi.reflection_library)
+            ctypes.CDLL(lcapi.backend_library)
         except Exception as e:
             if config.option.runappdirect:
                 return       # "can't run dummy tests in -A"
@@ -71,4 +71,4 @@
                     return
                 raise
 
-            lcapi.reflection_library = str(soname)
+            lcapi.backend_library = str(soname)
diff --git a/rpython/doc/jit/optimizer.rst b/rpython/doc/jit/optimizer.rst
--- a/rpython/doc/jit/optimizer.rst
+++ b/rpython/doc/jit/optimizer.rst
@@ -42,10 +42,9 @@
 There are better ways to compute the sum from ``[0..100]``, but it gives a better intuition on how
 traces are constructed than ``sum(range(101))``.
 Note that the trace syntax is the one used in the test suite. It is also very
-similar to traces printed at runtime by PYPYLOG_. The first line gives the input variables, the
-second line is a ``label`` operation, the last one is the backwards ``jump`` operation.
-
-.. _PYPYLOG: logging.html
+similar to traces printed at runtime by :doc:`PYPYLOG <../logging>`. The first
+line gives the input variables, the second line is a ``label`` operation, the
+last one is the backwards ``jump`` operation.
 
 These instructions mentioned earlier are special: