diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
@@ -2382,6 +2382,55 @@ def test_spawnve_noargs(self):
        self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], ('',), {})
        self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], [''], {})

# The introduction of this TestCase caused at least two different errors on
# *nix buildbots. Temporarily skip this to let the buildbots move along.
@unittest.skip("Skip due to platform/environment differences on *NIX buildbots")

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
@@ -813,6 +813,21 @@ def test_environ(self):
            self.assertEqual(type(k), item_type)
            self.assertEqual(type(v), item_type)

    @unittest.skipUnless(hasattr(posix, 'getcwd'), 'test needs posix.getcwd()')
    def test_getcwd_long_pathnames(self):
        dirname = 'getcwd-test-directory-0123456789abcdef-01234567890abcdef'

diff --git a/Misc/NEWS b/Misc/NEWS
@@ -374,6 +374,9 @@ Extension Modules
Library
-------

- bpo-30664: The description of a unittest subtest now preserves the order of
  keyword arguments of TestCase.subTest().


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -4894,6 +4894,14 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr)
            Py_DECREF(key2);
            goto error;
        }
        keyval = PyUnicode_FromFormat("%U=%U", key2, val2);
#else
        if (!PyUnicode_FSConverter(key, &key2))
@@ -4902,6 +4910,12 @@ parse_envlist(PyObject* env, Py_ssize_t *envc_ptr)
            Py_DECREF(key2);
            goto error;
        }
        keyval = PyBytes_FromFormat("%s=%s", PyBytes_AS_STRING(key2),
                                             PyBytes_AS_STRING(val2));
#endif
@@ -8985,9 +8999,16 @@ os_putenv_impl(PyObject *module, PyObject *name, PyObject *value)
{
    const wchar_t *env;

    PyObject *unicode = PyUnicode_FromFormat("%U=%U", name, value);
    if (unicode == NULL) {
-        PyErr_NoMemory();
        return NULL;
    }
    if (_MAX_ENV < PyUnicode_GET_LENGTH(unicode)) {
@@ -9029,12 +9050,15 @@ os_putenv_impl(PyObject *module, PyObject *name, PyObject *value)
{
    PyObject *bytes = NULL;
    char *env;
-    const char *name_string = PyBytes_AsString(name);
-    const char *value_string = PyBytes_AsString(value);

    bytes = PyBytes_FromFormat("%s=%s", name_string, value_string);
    if (bytes == NULL) {
-        PyErr_NoMemory();
        return NULL;
    }
-Original file line number
+Diff line change
@@ Expand Up / @@ -374,6 +374,9 @@ Extension Modules @@
     Library
     -------
     - bpo-30664: The description of a unittest subtest now preserves the order of
       keyword arguments of TestCase.subTest().