diff --git a/Misc/NEWS b/Misc/NEWS index 1f6875de423..3a4a6cc1793 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -181,6 +181,9 @@ Core and Builtins - 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 #10538: When using the "s*" code with PyArg_ParseTuple() to fill a Py_buffer structure with data from an object supporting only the old PyBuffer interface, a reference to the source objects is now properly added diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 21a6739d217..d2742a0ee15 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -441,9 +441,10 @@ _PyVerify_fd_dup2(int fd1, int fd2) #endif /* 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; @@ -463,7 +464,7 @@ convertenviron(void) 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