Mailman 3 August 2013 - Python-checkins

cpython: Issue #18608: Avoid keeping a strong reference to the locale module inside the
by antoine.pitrou Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/1c9aa4f68f2b changeset: 84954:1c9aa4f68f2b user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Aug 01 21:04:50 2013 +0200 summary: Issue #18608: Avoid keeping a strong reference to the locale module inside the _io module. files: Misc/NEWS | 3 + Modules/_io/_iomodule.c | 25 +++++++++++++++ Modules/_io/_iomodule.h | 2 + Modules/_io/textio.c | 48 ++++++++++++---------------- 4 files changed, 51 insertions(+), 27 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -179,6 +179,9 @@ Library ------- +- Issue #18608: Avoid keeping a strong reference to the locale module + inside the _io module. + - Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters, and make it GC-aware. diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -533,6 +533,31 @@ } +PyObject * +_PyIO_get_locale_module(_PyIO_State *state) +{ + PyObject *mod; + if (state->locale_module != NULL) { + assert(PyWeakref_CheckRef(state->locale_module)); + mod = PyWeakref_GET_OBJECT(state->locale_module); + if (mod != Py_None) { + Py_INCREF(mod); + return mod; + } + Py_CLEAR(state->locale_module); + } + mod = PyImport_ImportModule("locale"); + if (mod == NULL) + return NULL; + state->locale_module = PyWeakref_NewRef(mod, NULL); + if (state->locale_module == NULL) { + Py_DECREF(mod); + return NULL; + } + return mod; +} + + static int iomodule_traverse(PyObject *mod, visitproc visit, void *arg) { _PyIO_State *state = IO_MOD_STATE(mod); diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h --- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -137,6 +137,8 @@ #define IO_MOD_STATE(mod) ((_PyIO_State *)PyModule_GetState(mod)) #define IO_STATE IO_MOD_STATE(PyState_FindModule(&_PyIO_Module)) +extern PyObject *_PyIO_get_locale_module(_PyIO_State *); + extern PyObject *_PyIO_str_close; extern PyObject *_PyIO_str_closed; extern PyObject *_PyIO_str_decode; diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -917,35 +917,29 @@ } } if (encoding == NULL && self->encoding == NULL) { - if (state->locale_module == NULL) { - state->locale_module = PyImport_ImportModule("locale"); - if (state->locale_module == NULL) - goto catch_ImportError; + PyObject *locale_module = _PyIO_get_locale_module(state); + if (locale_module == NULL) + goto catch_ImportError; + self->encoding = _PyObject_CallMethodId( + locale_module, &PyId_getpreferredencoding, "O", Py_False); + Py_DECREF(locale_module); + if (self->encoding == NULL) { + catch_ImportError: + /* + Importing locale can raise a ImportError because of + _functools, and locale.getpreferredencoding can raise a + ImportError if _locale is not available. These will happen + during module building. + */ + if (PyErr_ExceptionMatches(PyExc_ImportError)) { + PyErr_Clear(); + self->encoding = PyUnicode_FromString("ascii"); + } else - goto use_locale; + goto error; } - else { - use_locale: - self->encoding = _PyObject_CallMethodId( - state->locale_module, &PyId_getpreferredencoding, "O", Py_False); - if (self->encoding == NULL) { - catch_ImportError: - /* - Importing locale can raise a ImportError because of - _functools, and locale.getpreferredencoding can raise a - ImportError if _locale is not available. These will happen - during module building. - */ - if (PyErr_ExceptionMatches(PyExc_ImportError)) { - PyErr_Clear(); - self->encoding = PyUnicode_FromString("ascii"); - } - else - goto error; - } - else if (!PyUnicode_Check(self->encoding)) - Py_CLEAR(self->encoding); - } + else if (!PyUnicode_Check(self->encoding)) + Py_CLEAR(self->encoding); } if (self->encoding != NULL) { encoding = _PyUnicode_AsString(self->encoding); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters,
by antoine.pitrou Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/71b63a32b1e3 changeset: 84953:71b63a32b1e3 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Aug 01 20:56:12 2013 +0200 summary: Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters, and make it GC-aware. files: Lib/test/test_atexit.py | 42 +++++++++- Misc/NEWS | 3 + Modules/atexitmodule.c | 121 ++++++++++++++++++--------- 3 files changed, 122 insertions(+), 44 deletions(-) diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py --- a/Lib/test/test_atexit.py +++ b/Lib/test/test_atexit.py @@ -2,6 +2,7 @@ import unittest import io import atexit +import _testcapi from test import support ### helpers @@ -23,7 +24,9 @@ def raise2(): raise SystemError -class TestCase(unittest.TestCase): + +class GeneralTest(unittest.TestCase): + def setUp(self): self.save_stdout = sys.stdout self.save_stderr = sys.stderr @@ -122,8 +125,43 @@ self.assertEqual(l, [5]) +class SubinterpreterTest(unittest.TestCase): + + def test_callbacks_leak(self): + # This test shows a leak in refleak mode if atexit doesn't + # take care to free callbacks in its per-subinterpreter module + # state. + n = atexit._ncallbacks() + code = r"""if 1: + import atexit + def f(): + pass + atexit.register(f) + del atexit + """ + ret = _testcapi.run_in_subinterp(code) + self.assertEqual(ret, 0) + self.assertEqual(atexit._ncallbacks(), n) + + def test_callbacks_leak_refcycle(self): + # Similar to the above, but with a refcycle through the atexit + # module. + n = atexit._ncallbacks() + code = r"""if 1: + import atexit + def f(): + pass + atexit.register(f) + atexit.__atexit = atexit + """ + ret = _testcapi.run_in_subinterp(code) + self.assertEqual(ret, 0) + self.assertEqual(atexit._ncallbacks(), n) + + def test_main(): - support.run_unittest(TestCase) + support.run_unittest(__name__) + if __name__ == "__main__": test_main() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -179,6 +179,9 @@ Library ------- +- Issue #18619: Fix atexit leaking callbacks registered from sub-interpreters, + and make it GC-aware. + - Issue #15699: The readline module now uses PEP 3121-style module initialization, so as to reclaim allocated resources (Python callbacks) at shutdown. Original patch by Robin Schreiber. diff --git a/Modules/atexitmodule.c b/Modules/atexitmodule.c --- a/Modules/atexitmodule.c +++ b/Modules/atexitmodule.c @@ -10,8 +10,6 @@ /* Forward declaration (for atexit_cleanup) */ static PyObject *atexit_clear(PyObject*, PyObject*); -/* Forward declaration (for atexit_callfuncs) */ -static void atexit_cleanup(PyObject*); /* Forward declaration of module object */ static struct PyModuleDef atexitmodule; @@ -33,6 +31,35 @@ #define GET_ATEXIT_STATE(mod) ((atexitmodule_state*)PyModule_GetState(mod)) +static void +atexit_delete_cb(atexitmodule_state *modstate, int i) +{ + atexit_callback *cb; + + cb = modstate->atexit_callbacks[i]; + modstate->atexit_callbacks[i] = NULL; + Py_DECREF(cb->func); + Py_DECREF(cb->args); + Py_XDECREF(cb->kwargs); + PyMem_Free(cb); +} + +/* Clear all callbacks without calling them */ +static void +atexit_cleanup(atexitmodule_state *modstate) +{ + atexit_callback *cb; + int i; + for (i = 0; i < modstate->ncallbacks; i++) { + cb = modstate->atexit_callbacks[i]; + if (cb == NULL) + continue; + + atexit_delete_cb(modstate, i); + } + modstate->ncallbacks = 0; +} + /* Installed into pythonrun.c's atexit mechanism */ static void @@ -78,34 +105,12 @@ } } - atexit_cleanup(module); + atexit_cleanup(modstate); if (exc_type) PyErr_Restore(exc_type, exc_value, exc_tb); } -static void -atexit_delete_cb(PyObject *self, int i) -{ - atexitmodule_state *modstate; - atexit_callback *cb; - - modstate = GET_ATEXIT_STATE(self); - cb = modstate->atexit_callbacks[i]; - modstate->atexit_callbacks[i] = NULL; - Py_DECREF(cb->func); - Py_DECREF(cb->args); - Py_XDECREF(cb->kwargs); - PyMem_Free(cb); -} - -static void -atexit_cleanup(PyObject *self) -{ - PyObject *r = atexit_clear(self, NULL); - Py_DECREF(r); -} - /* ===================================================================== */ /* Module methods. */ @@ -194,21 +199,50 @@ static PyObject * atexit_clear(PyObject *self, PyObject *unused) { + atexit_cleanup(GET_ATEXIT_STATE(self)); + Py_RETURN_NONE; +} + +PyDoc_STRVAR(atexit_ncallbacks__doc__, +"_ncallbacks() -> int\n\ +\n\ +Return the number of registered exit functions."); + +static PyObject * +atexit_ncallbacks(PyObject *self, PyObject *unused) +{ atexitmodule_state *modstate; - atexit_callback *cb; - int i; modstate = GET_ATEXIT_STATE(self); + return PyLong_FromSsize_t(modstate->ncallbacks); +} + +static int +atexit_m_traverse(PyObject *self, visitproc visit, void *arg) +{ + int i; + atexitmodule_state *modstate; + + modstate = GET_ATEXIT_STATE(self); for (i = 0; i < modstate->ncallbacks; i++) { - cb = modstate->atexit_callbacks[i]; + atexit_callback *cb = modstate->atexit_callbacks[i]; if (cb == NULL) continue; + Py_VISIT(cb->func); + Py_VISIT(cb->args); + Py_VISIT(cb->kwargs); + } + return 0; +} - atexit_delete_cb(self, i); - } - modstate->ncallbacks = 0; - Py_RETURN_NONE; +static int +atexit_m_clear(PyObject *self) +{ + atexitmodule_state *modstate; + modstate = GET_ATEXIT_STATE(self); + atexit_cleanup(modstate); + return 0; } static void @@ -216,6 +250,7 @@ { atexitmodule_state *modstate; modstate = GET_ATEXIT_STATE(m); + atexit_cleanup(modstate); PyMem_Free(modstate->atexit_callbacks); } @@ -246,7 +281,7 @@ if (eq < 0) return NULL; if (eq) - atexit_delete_cb(self, i); + atexit_delete_cb(modstate, i); } Py_RETURN_NONE; } @@ -260,6 +295,8 @@ atexit_unregister__doc__}, {"_run_exitfuncs", (PyCFunction) atexit_run_exitfuncs, METH_NOARGS, atexit_run_exitfuncs__doc__}, + {"_ncallbacks", (PyCFunction) atexit_ncallbacks, METH_NOARGS, + atexit_ncallbacks__doc__}, {NULL, NULL} /* sentinel */ }; @@ -275,15 +312,15 @@ static struct PyModuleDef atexitmodule = { - PyModuleDef_HEAD_INIT, - "atexit", - atexit__doc__, - sizeof(atexitmodule_state), - atexit_methods, - NULL, - NULL, - NULL, - (freefunc)atexit_free + PyModuleDef_HEAD_INIT, + "atexit", + atexit__doc__, + sizeof(atexitmodule_state), + atexit_methods, + NULL, + atexit_m_traverse, + atexit_m_clear, + (freefunc)atexit_free }; PyMODINIT_FUNC -- Repository URL: http://hg.python.org/cpython

1 0

cpython: test_capi: make a specific test case for the subinterpreter test
by antoine.pitrou Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/3e0275ec4373 changeset: 84952:3e0275ec4373 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Aug 01 20:43:26 2013 +0200 summary: test_capi: make a specific test case for the subinterpreter test (it was wrongly classified in the pending calls test case) files: Lib/test/test_capi.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -193,6 +193,9 @@ self.pendingcalls_submit(l, n) self.pendingcalls_wait(l, n) + +class SubinterpreterTest(unittest.TestCase): + def test_subinterps(self): import builtins r, w = os.pipe() @@ -208,6 +211,7 @@ self.assertNotEqual(pickle.load(f), id(sys.modules)) self.assertNotEqual(pickle.load(f), id(builtins)) + # Bug #6012 class Test6012(unittest.TestCase): def test(self): @@ -354,7 +358,8 @@ def test_main(): support.run_unittest(CAPITest, TestPendingCalls, Test6012, - EmbeddingTest, SkipitemTest, TestThreadState) + EmbeddingTest, SkipitemTest, TestThreadState, + SubinterpreterTest) for name in dir(_testcapi): if name.startswith('test_'): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Remove Lib/site.py hack to unregister patched builtins.
by antoine.pitrou Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/4ffa5f9e4ac2 changeset: 84951:4ffa5f9e4ac2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Aug 01 19:46:04 2013 +0200 summary: Remove Lib/site.py hack to unregister patched builtins. It creates a refleak in subinterpreters, as atexit callbacks aren't triggered at their end. files: Lib/site.py | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-) diff --git a/Lib/site.py b/Lib/site.py --- a/Lib/site.py +++ b/Lib/site.py @@ -68,7 +68,6 @@ ImportError exception, it is silently ignored. """ -import atexit import sys import os import re @@ -87,25 +86,6 @@ USER_BASE = None -_no_builtin = object() - -def _patch_builtins(**items): - # When patching builtins, we make some objects almost immortal - # (builtins are only reclaimed at the very end of the interpreter - # shutdown sequence). To avoid keeping to many references alive, - # we register callbacks to undo our builtins additions. - old_items = {k: getattr(builtins, k, _no_builtin) for k in items} - def unpatch(old_items=old_items): - for k, v in old_items.items(): - if v is _no_builtin: - delattr(builtins, k) - else: - setattr(builtins, k, v) - for k, v in items.items(): - setattr(builtins, k, v) - atexit.register(unpatch) - - def makepath(*paths): dir = os.path.join(*paths) try: @@ -377,7 +357,8 @@ except: pass raise SystemExit(code) - _patch_builtins(quit=Quitter('quit'), exit=Quitter('exit')) + builtins.quit = Quitter('quit') + builtins.exit = Quitter('exit') class _Printer(object): @@ -442,20 +423,20 @@ def setcopyright(): """Set 'copyright' and 'credits' in builtins""" - _patch_builtins(copyright=_Printer("copyright", sys.copyright)) + builtins.copyright = _Printer("copyright", sys.copyright) if sys.platform[:4] == 'java': - _patch_builtins(credits=_Printer( + builtins.credits = _Printer( "credits", - "Jython is maintained by the Jython developers (www.jython.org).")) + "Jython is maintained by the Jython developers (www.jython.org).") else: - _patch_builtins(credits=_Printer("credits", """\ + builtins.credits = _Printer("credits", """\ Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands - for supporting Python development. See www.python.org for more information.""")) + for supporting Python development. See www.python.org for more information.""") here = os.path.dirname(os.__file__) - _patch_builtins(license=_Printer( + builtins.license = _Printer( "license", "See http://www.python.org/%.3s/license.html" % sys.version, ["LICENSE.txt", "LICENSE"], - [os.path.join(here, os.pardir), here, os.curdir])) + [os.path.join(here, os.pardir), here, os.curdir]) class _Helper(object): @@ -472,7 +453,7 @@ return pydoc.help(*args, **kwds) def sethelper(): - _patch_builtins(help=_Helper()) + builtins.help = _Helper() def enablerlcompleter(): """Enable default readline configuration on interactive prompts, by -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Add a test for module weakrefability
by antoine.pitrou Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/cdddd3ed2ae1 changeset: 84950:cdddd3ed2ae1 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Aug 01 19:20:31 2013 +0200 summary: Add a test for module weakrefability files: Lib/test/test_module.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py --- a/Lib/test/test_module.py +++ b/Lib/test/test_module.py @@ -1,5 +1,6 @@ # Test the module type import unittest +import weakref from test.support import run_unittest, gc_collect from test.script_helper import assert_python_ok @@ -95,6 +96,14 @@ gc_collect() self.assertEqual(destroyed, [1]) + def test_weakref(self): + m = ModuleType("foo") + wr = weakref.ref(m) + self.assertIs(wr(), m) + del m + gc_collect() + self.assertIs(wr(), None) + def test_module_repr_minimal(self): # reprs when modules have no __file__, __name__, or __loader__ m = ModuleType('foo') -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #18569: The installer now adds .py to the PATHEXT variable
by martin.v.loewis Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/2a38e4da6ce8 changeset: 84949:2a38e4da6ce8 user: Martin v. Löwis <martin(a)v.loewis.de> date: Thu Aug 01 18:31:06 2013 +0200 summary: Issue #18569: The installer now adds .py to the PATHEXT variable when extensions are registered. Patch by Paul Moore. files: Misc/NEWS | 6 ++++++ Tools/msi/msi.py | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -734,6 +734,12 @@ - Issue #17532: Always include Options menu for IDLE on OS X. Patch by Guilherme Simões. +Windows +------- + +- Issue #18569: The installer now adds .py to the PATHEXT variable when extensions + are registered. Patch by Paul Moore. + Build ----- diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -1270,6 +1270,10 @@ "{60254CA5-953B-11CF-8C96-00AA00B8708C}", "REGISTRY.def"), ]) + # PATHEXT + add_data(db, "Environment", + [("PathExtAddition", "=-*PathExt", "[~];.PY", "REGISTRY.def")]) + # Registry keys prefix = r"Software\%sPython\PythonCore\%s" % (testprefix, short_version) add_data(db, "Registry", -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Add UUID for 3.4.
by martin.v.loewis Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/2c875178a8a2 changeset: 84948:2c875178a8a2 user: Martin v. Löwis <martin(a)v.loewis.de> date: Thu Aug 01 17:34:42 2013 +0200 summary: Add UUID for 3.4. files: Tools/msi/msi.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -121,6 +121,7 @@ "31":"{4afcba0b-13e4-47c3-bebe-477428b46913}", "32":"{3ff95315-1096-4d31-bd86-601d5438ad5e}", "33":"{f7581ca4-d368-4eea-8f82-d48c64c4f047}", + "34":"{7A0C5812-2583-40D9-BCBB-CD7485F11377}", } [major+minor] # Compute the name that Sphinx gives to the docfile -- Repository URL: http://hg.python.org/cpython

1 0

peps: Correctly spell hierarchy.
by guido.van.rossum Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/peps/rev/185a6cf22a00 changeset: 5014:185a6cf22a00 user: Guido van Rossum <guido(a)python.org> date: Thu Aug 01 08:04:13 2013 -0700 summary: Correctly spell hierarchy. files: pep-0413.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0413.txt b/pep-0413.txt --- a/pep-0413.txt +++ b/pep-0413.txt @@ -627,7 +627,7 @@ <news entries> # Add maint.1, compat.1 etc as releases are made -Putting the version information in the directory heirarchy isn't strictly +Putting the version information in the directory hierarchy isn't strictly necessary (since the NEWS file generator could figure out from the version history), but does make it easier for *humans* to keep the different versions in order. -- Repository URL: http://hg.python.org/peps

1 0

peps: Fix a typo
by nick.coghlan Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/peps/rev/ae0c89014b19 changeset: 5013:ae0c89014b19 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Thu Aug 01 23:34:34 2013 +1000 summary: Fix a typo files: pep-0008.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0008.txt b/pep-0008.txt --- a/pep-0008.txt +++ b/pep-0008.txt @@ -1080,7 +1080,7 @@ annotation style. Instead, the annotations are left for users to discover and experiment with useful annotation styles. - It is recommended that third party experimants with annotations use an + It is recommended that third party experiments with annotations use an associated decorator to indicate how the annotation should be interpreted. -- Repository URL: http://hg.python.org/peps

1 0

cpython: - Issue #18257: Fix readlink usage in python-config. Install the python
by matthias.klose Aug. 1, 2013

Aug. 1, 2013

http://hg.python.org/cpython/rev/7b165c7ab7ef changeset: 84947:7b165c7ab7ef user: doko(a)ubuntu.com date: Thu Aug 01 15:32:49 2013 +0200 summary: - Issue #18257: Fix readlink usage in python-config. Install the python version again on Darwin. files: Makefile.pre.in | 7 +++++++ Misc/NEWS | 3 +++ Misc/python-config.in | 2 ++ Misc/python-config.sh.in | 9 +++++++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1201,6 +1201,13 @@ sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} sed -e 's,\$$($[A-Za-z0-9_]*$),\$$\{\1\},g' < Misc/python-config.sh >python-config + # On Darwin, always use the python version of the script, the shell + # version doesn't use the compiler customizations that are provided + # in python (_osx_support.py). + if test `uname -s` = Darwin; then \ + cp python-config.py python-config; \ + fi + # Install the include files INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -737,6 +737,9 @@ Build ----- +- Issue #18257: Fix readlink usage in python-config. Install the python + version again on Darwin. + - Issue #18481: Add C coverage reporting with gcov and lcov. A new make target "coverage-report" creates an instrumented Python build, runs unit tests and creates a HTML. The report can be updated with "make coverage-lcov". diff --git a/Misc/python-config.in b/Misc/python-config.in --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -1,6 +1,8 @@ #!@EXENAME@ # -*- python -*- +# Keep this script in sync with python-config.sh.in + import getopt import os import sys diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# Keep this script in sync with python-config.in + exit_with_usage () { echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir" @@ -15,7 +17,9 @@ { RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) if which readlink >/dev/null 2>&1 ; then - RESULT=$(readlink -f "$RESULT") + if readlink -f "$RESULT" >/dev/null 2>&1; then + RESULT=$(readlink -f "$RESULT") + fi fi echo $RESULT } @@ -23,7 +27,8 @@ prefix_build="@prefix@" prefix_real=$(installed_prefix "$0") -# Use sed to fix paths from their built to locations to their installed to locations. +# Use sed to fix paths from their built-to locations to their installed-to +# locations. prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") exec_prefix_build="@exec_prefix@" exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -- Repository URL: http://hg.python.org/cpython

1 0