(original) (raw)

changeset: 81730:ea9fd9c9c677 branch: 3.2 parent: 81726:e28b30e6eee6 user: Ronald Oussoren ronaldoussoren@mac.com date: Fri Jan 25 17:57:13 2013 +0100 files: Misc/NEWS Modules/posixmodule.c description: Issue #1602133: 'environ' is not really available with shared libraries on OSX There already was a workaround for this for framework builds on OSX, this changeset enables the same workaround for shared libraries. Closes #1602133 diff -r e28b30e6eee6 -r ea9fd9c9c677 Misc/NEWS --- a/Misc/NEWS Fri Jan 25 15:33:25 2013 +0100 +++ b/Misc/NEWS Fri Jan 25 17:57:13 2013 +0100 @@ -197,6 +197,9 @@ - Issue #13521: dict.setdefault() now does only one lookup for the given key, making it "atomic" for many purposes. Patch by Filip Gruszczyński. +- Issue #1602133: on Mac OS X a shared library build (``--enable-shared``) + now fills the ``os.environ`` variable correctly. + - Issue #14471: Fix a possible buffer overrun in the winreg module. Library diff -r e28b30e6eee6 -r ea9fd9c9c677 Modules/posixmodule.c --- a/Modules/posixmodule.c Fri Jan 25 15:33:25 2013 +0100 +++ b/Modules/posixmodule.c Fri Jan 25 17:57:13 2013 +0100 @@ -501,9 +501,10 @@ #endif /* MS_WINDOWS */ /* Return a dictionary corresponding to the POSIX environment table */ -#ifdef WITH_NEXT_FRAMEWORK +#if defined(WITH_NEXT_FRAMEWORK) || (defined(__APPLE__) && defined(Py_ENABLE_SHARED)) /* On Darwin/MacOSX a shared library or framework has no access to -** environ directly, we must obtain it with _NSGetEnviron(). +** environ directly, we must obtain it with _NSGetEnviron(). See also +** man environ(7). */ #include static char **environ; @@ -528,7 +529,7 @@ d = PyDict_New(); if (d == NULL) return NULL; -#ifdef WITH_NEXT_FRAMEWORK +#if defined(WITH_NEXT_FRAMEWORK) || (defined(__APPLE__) && defined(Py_ENABLE_SHARED)) if (environ == NULL) environ = *_NSGetEnviron(); #endif/ronaldoussoren@mac.com