Oct 20, 2022 · Oct 18, 2022 · Oct 18, 2022 · Oct 18, 2022 · Oct 18, 2022 · Oct 19, 2022
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
            mod = imp.load_module('mymod', file, path, description)
        self.assertEqual(mod.x, 42)

    def test_issue98354(self):
        # _imp.create_builtin should raise TypeError
        # if 'name' attribute of 'spec' argument is not a 'str' instance

        create_builtin = support.get_attribute(_imp, "create_builtin")

        class FakeSpec:
            def __init__(self, name):
                self.name = self
        spec = FakeSpec("time")
        with self.assertRaises(TypeError):
            create_builtin(spec)

        class FakeSpec2:
            name = [1, 2, 3, 4]
        spec = FakeSpec2()
        with self.assertRaises(TypeError):
            create_builtin(spec)

        import builtins
        class UnicodeSubclass(str):
            pass
        class GoodSpec:
            name = UnicodeSubclass("builtins")
        spec = GoodSpec()
        bltin = create_builtin(spec)
        self.assertEqual(bltin, builtins)

        class UnicodeSubclassFakeSpec(str):
            def __init__(self, name):
                self.name = self
        spec = UnicodeSubclassFakeSpec("builtins")
        bltin = create_builtin(spec)
        self.assertEqual(bltin, builtins)

 class ReloadTests(unittest.TestCase):

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-10-19-18-03-28.gh-issue-98354.GRGta3.rst b/Misc/NEWS.d/next/Core and Builtins/2022-10-19-18-03-28.gh-issue-98354.GRGta3.rst
 Added unicode check for ``name`` attribute of ``spec`` argument passed in :func:`_imp.create_builtin` function.
diff --git a/Python/import.c b/Python/import.c
        return NULL;
    }

    if (!PyUnicode_Check(name)) {
        PyErr_Format(PyExc_TypeError,
                     "name must be string, not %.200s",
                     Py_TYPE(name)->tp_name);
        Py_DECREF(name);
        return NULL;
    }

    PyObject *mod = create_builtin(tstate, name, spec);
    Py_DECREF(name);
    return mod;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -378,6 +378,40 @@ def test_find_and_load_checked_pyc(self):
		mod = imp.load_module('mymod', file, path, description)
		self.assertEqual(mod.x, 42)

		def test_issue98354(self):
		# _imp.create_builtin should raise TypeError
		# if 'name' attribute of 'spec' argument is not a 'str' instance
chgnrdv marked this conversation as resolved. Show resolvedHide resolved

		create_builtin = support.get_attribute(_imp, "create_builtin")

		class FakeSpec:
		def __init__(self, name):
		self.name = self
		spec = FakeSpec("time")
		with self.assertRaises(TypeError):
		create_builtin(spec)

		class FakeSpec2:
		name = [1, 2, 3, 4]
		spec = FakeSpec2()
		with self.assertRaises(TypeError):
		create_builtin(spec)

		import builtins
		class UnicodeSubclass(str):
		pass
		class GoodSpec:
		name = UnicodeSubclass("builtins")
		spec = GoodSpec()
		bltin = create_builtin(spec)
		self.assertEqual(bltin, builtins)

		class UnicodeSubclassFakeSpec(str):
		def __init__(self, name):
		self.name = self
		spec = UnicodeSubclassFakeSpec("builtins")
		bltin = create_builtin(spec)
		self.assertEqual(bltin, builtins)

		class ReloadTests(unittest.TestCase):

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Added unicode check for ``name`` attribute of ``spec`` argument passed in :func:`_imp.create_builtin` function.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1021,6 +1021,14 @@ _imp_create_builtin(PyObject module, PyObject spec)
		return NULL;
		}

		if (!PyUnicode_Check(name)) {
		PyErr_Format(PyExc_TypeError,
		"name must be string, not %.200s",
		Py_TYPE(name)->tp_name);
		Py_DECREF(name);
		return NULL;
chgnrdv marked this conversation as resolved. Show resolvedHide resolved
		}

		PyObject *mod = create_builtin(tstate, name, spec);
		Py_DECREF(name);
		return mod;
Expand Down