@@ -93,12 +93,12 @@ Process-wide parameters
       single: main()
       triple: stdin; stdout; sdterr
 
-   This function should be called before :c:func:`Py_Initialize`. It
-   specifies which encoding and error handling to use with standard io,
-   with the same meanings as in :func:`str.encode`.
+   This function should be called before :c:func:`Py_Initialize`, if it is
+   called at all. It specifies which encoding and error handling to use
+   with standard IO, with the same meanings as in :func:`str.encode`.
 
    It overrides :envvar:`PYTHONIOENCODING` values, and allows embedding code
-   to control io encoding when the environment variable does not work.
+   to control IO encoding when the environment variable does not work.
 
    ``encoding`` and/or ``errors`` may be NULL to use
    :envvar:`PYTHONIOENCODING` and/or default values (depending on other
@@ -110,7 +110,10 @@ Process-wide parameters
    If :c:func:`Py_Finalize` is called, this function will need to be called
    again in order to affect subsequent calls to :c:func:`Py_Initialize`.
 
-   Returns 0 if successful.
+   Returns 0 if successful, a nonzero value on error (e.g. calling after the
+   interpreter has already been initialized).
+
+   .. versionadded:: 3.4
 
 
 .. c:function:: void Py_SetProgramName(wchar_t *name)
 
@@ -28,8 +28,13 @@ PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);
 PyAPI_FUNC(void) Py_SetPythonHome(wchar_t *);
 PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void);
 
+#ifndef Py_LIMITED_API
+/* Only used by applications that embed the interpreter and need to
+ * override the standard encoding determination mechanism
+ */
 PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding,
                                              const char *errors);
+#endif
 
 PyAPI_FUNC(void) Py_Initialize(void);
 PyAPI_FUNC(void) Py_InitializeEx(int);
 
@@ -148,11 +148,17 @@ Py_SetStandardStreamEncoding(const char *encoding, const char *errors)
         /* This is too late to have any effect */
         return -1;
     }
+    /* Can't call PyErr_NoMemory() on errors, as Python hasn't been
+     * initialised yet.
+     *
+     * However, the raw memory allocators are initialised appropriately
+     * as C static variables, so _PyMem_RawStrdup is OK even though
+     * Py_Initialize hasn't been called yet.
+     */
     if (encoding) {
         _Py_StandardStreamEncoding = _PyMem_RawStrdup(encoding);
         if (!_Py_StandardStreamEncoding) {
-            PyErr_NoMemory();
-            return -1;
+            return -2;
         }
     }
     if (errors) {
@@ -161,8 +167,7 @@ Py_SetStandardStreamEncoding(const char *encoding, const char *errors)
             if (_Py_StandardStreamEncoding) {
                 PyMem_RawFree(_Py_StandardStreamEncoding);
             }
-            PyErr_NoMemory();
-            return -1;
+            return -3;
         }
     }
     return 0;
Original file line number	Diff line number	Diff line change
@@ -148,11 +148,17 @@ Py_SetStandardStreamEncoding(const char encoding, const char errors)
148	148	/* This is too late to have any effect */
149	149	return -1;
150	150	}
	151	+ /* Can't call PyErr_NoMemory() on errors, as Python hasn't been
	152	+ * initialised yet.
	153	+ *
	154	+ * However, the raw memory allocators are initialised appropriately
	155	+ * as C static variables, so _PyMem_RawStrdup is OK even though
	156	+ * Py_Initialize hasn't been called yet.
	157	+ */
151	158	if (encoding) {
152	159	_Py_StandardStreamEncoding = _PyMem_RawStrdup(encoding);
153	160	if (!_Py_StandardStreamEncoding) {
154		- PyErr_NoMemory();
155		- return -1;
	161	+ return -2;
156	162	}
157	163	}
158	164	if (errors) {
@@ -161,8 +167,7 @@ Py_SetStandardStreamEncoding(const char encoding, const char errors)
161	167	if (_Py_StandardStreamEncoding) {
162	168	PyMem_RawFree(_Py_StandardStreamEncoding);
163	169	}
164		- PyErr_NoMemory();
165		- return -1;
	170	+ return -3;
166	171	}
167	172	}
168	173	return 0;