_PyLazyImport_New improvements

Author: DinoV

Lib/test/test_import/test_lazy_imports.py

@@ -205,6 +205,11 @@ def test_lazy_import_type_exposed(self):
         self.assertHasAttr(types, 'LazyImportType')
         self.assertEqual(types.LazyImportType.__name__, 'lazy_import')
 
+    def test_lazy_import_type_invalid_name(self):
+        """passing invalid name to lazy imports should raise a TypeError"""
+        with self.assertRaises(TypeError) as cm:
+            types.LazyImportType({}, None)
+
     def test_lazy_import_type_invalid_fromlist_type(self):
         """LazyImportType should reject invalid fromlist types."""
         # fromlist must be None, a string, or a tuple - not an int

Objects/lazyimportobject.c

@@ -11,17 +11,17 @@
 #define PyLazyImportObject_CAST(op) ((PyLazyImportObject *)(op))
 
 PyObject *
-_PyLazyImport_New(PyObject *builtins, PyObject *from, PyObject *attr)
+_PyLazyImport_New(PyObject *builtins, PyObject *name, PyObject *fromlist)
 {
     PyLazyImportObject *m;
-    if (!from || !PyUnicode_Check(from)) {
-        PyErr_BadArgument();
+    if (!name || !PyUnicode_Check(name)) {
+        PyErr_SetString(PyExc_TypeError, "expected str for name");
         return NULL;
     }
-    if (attr == Py_None || attr == NULL) {
-        attr = NULL;
+    if (fromlist == Py_None || fromlist == NULL) {
+        fromlist = NULL;
     }
-    else if (!PyUnicode_Check(attr) && !PyTuple_Check(attr)) {
+    else if (!PyUnicode_Check(fromlist) && !PyTuple_Check(fromlist)) {
         PyErr_SetString(PyExc_TypeError,
                         "lazy_import: fromlist must be None, a string, or a tuple");
         return NULL;
@@ -31,8 +31,8 @@ _PyLazyImport_New(PyObject *builtins, PyObject *from, PyObject *attr)
         return NULL;
     }
     m->lz_builtins = Py_XNewRef(builtins);
-    m->lz_from = Py_NewRef(from);
-    m->lz_attr = Py_XNewRef(attr);
+    m->lz_from = Py_NewRef(name);
+    m->lz_attr = Py_XNewRef(fromlist);
 
     /* Capture frame information for the original import location */
     m->lz_code = NULL;