diff --git a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py
@@ -62,6 +62,8 @@ def test_load_library(self):
            windll["kernel32"].GetModuleHandleW
            windll.LoadLibrary("kernel32").GetModuleHandleW
            WinDLL("kernel32").GetModuleHandleW

    @unittest.skipUnless(os.name == "nt",
                         'test specific to Windows')

diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
@@ -81,7 +81,7 @@ def test_window_funcs(self):
        win2 = curses.newwin(15,15, 5,5)

        for meth in [stdscr.addch, stdscr.addstr]:
-            for args in [('a'), ('a', curses.A_BOLD),
                         (4,4, 'a'), (5,5, 'a', curses.A_BOLD)]:
                with self.subTest(meth=meth.__qualname__, args=args):
                    meth(*args)
@@ -194,6 +194,15 @@ def test_window_funcs(self):
        self.assertRaises(ValueError, stdscr.instr, -2)
        self.assertRaises(ValueError, stdscr.instr, 2, 3, -2)


    def test_module_funcs(self):
        "Test module-level functions"

diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py
@@ -50,6 +50,8 @@ def test_errors(self):
        self.assertRaises(TypeError, grp.getgrgid)
        self.assertRaises(TypeError, grp.getgrnam)
        self.assertRaises(TypeError, grp.getgrall, 42)

        # try to get some errors
        bynames = {}

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
@@ -314,6 +314,10 @@ def test_multiple_calls_to_get_data(self):
        loader.get_data(imp.__file__)  # File should be closed
        loader.get_data(imp.__file__)  # Will need to create a newly opened file


class ReloadTests(unittest.TestCase):


diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
@@ -346,9 +346,14 @@ def test_strcoll(self):
        self.assertLess(locale.strcoll('a', 'b'), 0)
        self.assertEqual(locale.strcoll('a', 'a'), 0)
        self.assertGreater(locale.strcoll('b', 'a'), 0)

    def test_strxfrm(self):
        self.assertLess(locale.strxfrm('a'), locale.strxfrm('b'))


class TestEnUSCollation(BaseLocalizedTest, TestCollation):

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
@@ -126,6 +126,10 @@ def test_strftime(self):
            except ValueError:
                self.fail('conversion specifier: %r failed.' % format)

    def _bounds_checking(self, func):
        # Make sure that strftime() checks the bounds of the various parts
        # of the time tuple (0 is valid for *all* values).

diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py
@@ -96,6 +96,8 @@ def test_errors(self):
        self.assertRaises(TypeError, winsound.PlaySound, "bad",
                          winsound.SND_MEMORY)
        self.assertRaises(TypeError, winsound.PlaySound, 1, 0)

    def test_keyword_args(self):
        safe_PlaySound(flags=winsound.SND_ALIAS, sound="SystemExit")

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
@@ -1253,10 +1253,11 @@ static PyObject *load_library(PyObject *self, PyObject *args)
    PyObject *nameobj;
    PyObject *ignored;
    HMODULE hMod;
-    if (!PyArg_ParseTuple(args, "O|O:LoadLibrary", &nameobj, &ignored))
        return NULL;

-    name = PyUnicode_AsUnicode(nameobj);
    if (!name)
        return NULL;


diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -341,9 +341,11 @@ static int
PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj,
                         PyObject **bytes, wchar_t **wstr)
{
    if (PyUnicode_Check(obj)) {
#ifdef HAVE_NCURSESW
        assert (wstr != NULL);
        *wstr = PyUnicode_AsWideCharString(obj, NULL);
        if (*wstr == NULL)
            return 0;
@@ -353,12 +355,20 @@ PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj,
        *bytes = PyUnicode_AsEncodedString(obj, win->encoding, NULL);
        if (*bytes == NULL)
            return 0;
        return 1;
#endif
    }
    else if (PyBytes_Check(obj)) {
        Py_INCREF(obj);
        *bytes = obj;
        return 1;
    }


diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
@@ -252,6 +252,11 @@ PyLocale_strxfrm(PyObject* self, PyObject* args)
    s = PyUnicode_AsWideCharString(str, &n1);
    if (s == NULL)
        goto exit;

    /* assume no change in size, first */
    n1 = n1 + 1;

diff --git a/Modules/nismodule.c b/Modules/nismodule.c
@@ -169,6 +169,7 @@ nis_match (PyObject *self, PyObject *args, PyObject *kwdict)
        return NULL;
    if ((bkey = PyUnicode_EncodeFSDefault(ukey)) == NULL)
        return NULL;
    if (PyBytes_AsStringAndSize(bkey, &key, &keylen) == -1) {
        Py_DECREF(bkey);
        return NULL;

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -3757,7 +3757,7 @@ os__getfinalpathname_impl(PyObject *module, PyObject *path)
    PyObject *result;
    const wchar_t *path_wchar;

-    path_wchar = PyUnicode_AsUnicode(path);
    if (path_wchar == NULL)
        return NULL;

@@ -7209,7 +7209,7 @@ win_readlink(PyObject *self, PyObject *args, PyObject *kwargs)
                          ))
        return NULL;

-    path = PyUnicode_AsUnicode(po);
    if (path == NULL)
        return NULL;

@@ -9002,6 +9002,7 @@ os_putenv_impl(PyObject *module, PyObject *name, PyObject *value)
/*[clinic end generated code: output=d29a567d6b2327d2 input=ba586581c2e6105f]*/
{
    const wchar_t *env;

    /* Search from index 1 because on Windows starting '=' is allowed for
       defining hidden environment variables. */
@@ -9015,16 +9016,21 @@ os_putenv_impl(PyObject *module, PyObject *name, PyObject *value)
    if (unicode == NULL) {
        return NULL;
    }
-    if (_MAX_ENV < PyUnicode_GET_LENGTH(unicode)) {
        PyErr_Format(PyExc_ValueError,
                     "the environment variable is longer than %u characters",
                     _MAX_ENV);
        goto error;
    }
-
-    env = PyUnicode_AsUnicode(unicode);
-    if (env == NULL)
        goto error;
    if (_wputenv(env)) {
        posix_error();
        goto error;

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -4133,6 +4133,20 @@ PyUnicode_AsUnicode(PyObject *unicode)
    return PyUnicode_AsUnicodeAndSize(unicode, NULL);
}


Py_ssize_t
PyUnicode_GetSize(PyObject *unicode)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -314,6 +314,10 @@ def test_multiple_calls_to_get_data(self):
		loader.get_data(imp.__file__) # File should be closed
		loader.get_data(imp.__file__) # Will need to create a newly opened file


		class ReloadTests(unittest.TestCase):

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -4133,6 +4133,20 @@ PyUnicode_AsUnicode(PyObject *unicode) @@
         return PyUnicode_AsUnicodeAndSize(unicode, NULL);
     }
     Py_ssize_t
     PyUnicode_GetSize(PyObject *unicode)
@@ Expand Down @@