partially switched moduleobject.cs and importhook.cs to the new style…

… references
pythonnet · lostmsu · Dec 14, 2021 · Oct 17, 2021 · Oct 17, 2021 · Oct 17, 2021
commit ebdf7c529a05ee2b2c74e10b0667f00c10233221
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -8,9 +8,12 @@ namespace Python.Runtime
     /// </summary>
     internal static class ImportHook
     {
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        // set in Initialize
         private static CLRModule root;
-        private static IntPtr py_clr_module;
-        static BorrowedReference ClrModuleReference => new BorrowedReference(py_clr_module);
+        private static PyModule py_clr_module;
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        static BorrowedReference ClrModuleReference => py_clr_module.Reference;
 
         private const string LoaderCode = @"
 import importlib.abc
@@ -54,13 +57,13 @@ internal static unsafe void Initialize()
             root = new CLRModule();
 
             // create a python module with the same methods as the clr module-like object
-            py_clr_module = Runtime.PyModule_New("clr").DangerousMoveToPointer();
+            py_clr_module = new PyModule(Runtime.PyModule_New("clr").StealOrThrow());
 
             // both dicts are borrowed references
             BorrowedReference mod_dict = Runtime.PyModule_GetDict(ClrModuleReference);
             using var clr_dict = Runtime.PyObject_GenericGetDict(root.ObjectReference);
 
-            Runtime.PyDict_Update(mod_dict, clr_dict);
+            Runtime.PyDict_Update(mod_dict, clr_dict.BorrowOrThrow());
             BorrowedReference dict = Runtime.PyImport_GetModuleDict();
             Runtime.PyDict_SetItemString(dict, "CLR", ClrModuleReference);
             Runtime.PyDict_SetItemString(dict, "clr", ClrModuleReference);
@@ -79,11 +82,10 @@ internal static void Shutdown()
             }
 
             TeardownNameSpaceTracking();
-            Runtime.XDecref(py_clr_module);
-            py_clr_module = IntPtr.Zero;
+            Runtime.Py_CLEAR(ref py_clr_module!);
 
             Runtime.XDecref(root.pyHandle);
-            root = null;
+            root = null!;
             CLRModule.Reset();
         }
 
@@ -110,32 +112,32 @@ internal static void RestoreRuntimeData(RuntimeDataStorage storage)
         static void SetupImportHook()
         {
             // Create the import hook module
-            var import_hook_module = Runtime.PyModule_New("clr.loader");
+            using var import_hook_module = Runtime.PyModule_New("clr.loader");
+            BorrowedReference mod_dict = Runtime.PyModule_GetDict(import_hook_module.BorrowOrThrow());
 
             // Run the python code to create the module's classes.
             var builtins = Runtime.PyEval_GetBuiltins();
             var exec = Runtime.PyDict_GetItemString(builtins, "exec");
-            using var args = NewReference.DangerousFromPointer(Runtime.PyTuple_New(2));
-
-            var codeStr = NewReference.DangerousFromPointer(Runtime.PyString_FromString(LoaderCode));
-            Runtime.PyTuple_SetItem(args, 0, codeStr);
-            var mod_dict = Runtime.PyModule_GetDict(import_hook_module);
+            using var args = Runtime.PyTuple_New(2);
+            PythonException.ThrowIfIsNull(args);
+            using var codeStr = Runtime.PyString_FromString(LoaderCode);
+            Runtime.PyTuple_SetItem(args.Borrow(), 0, codeStr.StealOrThrow());
+
             // reference not stolen due to overload incref'ing for us.
-            Runtime.PyTuple_SetItem(args, 1, mod_dict);
-            Runtime.PyObject_Call(exec, args, default).Dispose();
+            Runtime.PyTuple_SetItem(args.Borrow(), 1, mod_dict);
+            Runtime.PyObject_Call(exec, args.Borrow(), default).Dispose();
             // Set as a sub-module of clr.
-            if(Runtime.PyModule_AddObject(ClrModuleReference, "loader", import_hook_module.DangerousGetAddress()) != 0)
+            if(Runtime.PyModule_AddObject(ClrModuleReference, "loader", import_hook_module) != 0)
             {
-                Runtime.XDecref(import_hook_module.DangerousGetAddress());
                 throw PythonException.ThrowLastAsClrException();
             }
 
             // Finally, add the hook to the meta path
             var findercls = Runtime.PyDict_GetItemString(mod_dict, "DotNetFinder");
-            var finderCtorArgs = NewReference.DangerousFromPointer(Runtime.PyTuple_New(0));
-            var finder_inst = Runtime.PyObject_CallObject(findercls, finderCtorArgs);
+            using var finderCtorArgs = Runtime.PyTuple_New(0);
+            using var finder_inst = Runtime.PyObject_CallObject(findercls, finderCtorArgs.Borrow());
             var metapath = Runtime.PySys_GetObject("meta_path");
-            Runtime.PyList_Append(metapath, finder_inst);
+            PythonException.ThrowIfIsNotZero(Runtime.PyList_Append(metapath, finder_inst.BorrowOrThrow()));
         }
 
         /// <summary>
@@ -149,12 +151,12 @@ static void SetupNamespaceTracking()
             using var newset = Runtime.PySet_New(default);
             foreach (var ns in AssemblyManager.GetNamespaces())
             {
-                using var pyNs = NewReference.DangerousFromPointer(Runtime.PyString_FromString(ns));
-                if (Runtime.PySet_Add(newset, pyNs) != 0)
+                using var pyNs = Runtime.PyString_FromString(ns);
+                if (Runtime.PySet_Add(newset.Borrow(), pyNs.BorrowOrThrow()) != 0)
                 {
                     throw PythonException.ThrowLastAsClrException();
                 }
-                if (Runtime.PyDict_SetItemString(root.dict, availableNsKey, newset) != 0)
+                if (Runtime.PyDict_SetItemString(root.dict, availableNsKey, newset.Borrow()) != 0)
                 {
                     throw PythonException.ThrowLastAsClrException();
                 }
@@ -187,22 +189,15 @@ internal static int AddPendingNamespaces()
 
         internal static void AddNamespaceWithGIL(string name)
         {
-            var pyNs = Runtime.PyString_FromString(name);
-            try
+            using var pyNs = Runtime.PyString_FromString(name);
+            var nsSet = Runtime.PyDict_GetItemString(root.dict, availableNsKey);
+            if (!(nsSet.IsNull  || nsSet == Runtime.PyNone))
             {
-                var nsSet = Runtime.PyDict_GetItemString(root.dict, availableNsKey);
-                if (!(nsSet.IsNull  || nsSet.DangerousGetAddress() == Runtime.PyNone))
+                if (Runtime.PySet_Add(nsSet, pyNs.BorrowOrThrow()) != 0)
                 {
-                    if (Runtime.PySet_Add(nsSet, new BorrowedReference(pyNs)) != 0)
-                    {
-                        throw PythonException.ThrowLastAsClrException();
-                    }
+                    throw PythonException.ThrowLastAsClrException();
                 }
             }
-            finally
-            {
-                Runtime.XDecref(pyNs);
-            }
         }
 
 
@@ -218,8 +213,7 @@ internal static void UpdateCLRModuleDict()
             root.LoadNames();
             BorrowedReference py_mod_dict = Runtime.PyModule_GetDict(ClrModuleReference);
             using var clr_dict = Runtime.PyObject_GenericGetDict(root.ObjectReference);
-
-            Runtime.PyDict_Update(py_mod_dict, clr_dict);
+            Runtime.PyDict_Update(py_mod_dict, clr_dict.BorrowOrThrow());
         }
 
         /// <summary>
@@ -228,15 +222,14 @@ internal static void UpdateCLRModuleDict()
         public static unsafe NewReference GetCLRModule()
         {
             UpdateCLRModuleDict();
-            Runtime.XIncref(py_clr_module);
-            return NewReference.DangerousFromPointer(py_clr_module);
+            return new NewReference(py_clr_module);
         }
 
         /// <summary>
         /// The hook to import a CLR module into Python. Returns a new reference
         /// to the module.
         /// </summary>
-        public static ModuleObject Import(string modname)
+        public static PyObject Import(string modname)
         {
             // Traverse the qualified module name to get the named module. 
             // Note that if
@@ -248,7 +241,7 @@ public static ModuleObject Import(string modname)
             // enable preloading in a non-interactive python processing by
             // setting clr.preload = True
 
-            ModuleObject head = null;
+            ModuleObject? head = null;
             ModuleObject tail = root;
             root.InitializePreload();
 
@@ -271,24 +264,7 @@ public static ModuleObject Import(string modname)
                     tail.LoadNames();
                 }
             }
-            tail.IncrRefCount();
-            return tail;
-        }
-
-        private static bool IsLoadAll(BorrowedReference fromList)
-        {
-            if (fromList == null) throw new ArgumentNullException(nameof(fromList));
-
-            if (CLRModule.preload)
-            {
-                return false;
-            }
-            if (Runtime.PySequence_Size(fromList) != 1)
-            {
-                return false;
-            }
-            using var fp = Runtime.PySequence_GetItem(fromList, 0);
-            return Runtime.GetManagedString(fp) == "*";
+            return new PyObject(tail.ObjectReference);
         }
     }
 }
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -16,7 +16,7 @@ internal class ModuleObject : ExtensionType
         private Dictionary<string, ManagedType> cache;
 
         internal string moduleName;
-        private readonly PyDict dict;
+        internal readonly PyDict dict;
         protected string _namespace;
         private readonly PyList __all__ = new ();
 
@@ -69,10 +69,9 @@ public ModuleObject(string name)
         /// namespace (or null if the name is not found). This method does
         /// not increment the Python refcount of the returned object.
         /// </summary>
-        public ManagedType GetAttribute(string name, bool guess)
+        public ManagedType? GetAttribute(string name, bool guess)
         {
-            ManagedType cached = null;
-            cache.TryGetValue(name, out cached);
+            cache.TryGetValue(name, out var cached);
             if (cached != null)
             {
                 return cached;
@@ -130,7 +129,7 @@ public ManagedType GetAttribute(string name, bool guess)
                 string gname = GenericUtil.GenericNameForBaseName(_namespace, name);
                 if (gname != null)
                 {
-                    ManagedType o = GetAttribute(gname, false);
+                    ManagedType? o = GetAttribute(gname, false);
                     if (o != null)
                     {
                         StoreAttribute(name, o);
@@ -169,10 +168,9 @@ private void StoreAttribute(string name, ManagedType ob)
         /// </summary>
         public void LoadNames()
         {
-            ManagedType m = null;
             foreach (string name in AssemblyManager.GetNames(_namespace))
             {
-                cache.TryGetValue(name, out m);
+                cache.TryGetValue(name, out var m);
                 if (m != null)
                 {
                     continue;
@@ -252,7 +250,7 @@ internal void InitializeModuleMembers()
         /// </summary>
         public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference key)
         {
-            var self = (ModuleObject)GetManagedObject(ob);
+            var self = (ModuleObject)GetManagedObject(ob)!;
 
             if (!Runtime.PyString_Check(key))
             {
@@ -266,7 +264,7 @@ public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference k
                 return new NewReference(op);
             }
 
-            string name = InternString.GetManagedString(key);
+            string? name = InternString.GetManagedString(key);
             if (name == "__dict__")
             {
                 return new NewReference(self.dict);
@@ -278,10 +276,11 @@ public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference k
                 return new NewReference(self.__all__);
             }
 
-            ManagedType attr = null;
+            ManagedType? attr;
 
             try
             {
+                if (name is null) throw new ArgumentNullException();
                 attr = self.GetAttribute(name, true);
             }
             catch (Exception e)
@@ -305,13 +304,13 @@ public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference k
         /// </summary>
         public static NewReference tp_repr(BorrowedReference ob)
         {
-            var self = (ModuleObject)GetManagedObject(ob);
+            var self = (ModuleObject)GetManagedObject(ob)!;
             return Runtime.PyString_FromString($"<module '{self.moduleName}'>");
         }
 
         public static int tp_traverse(BorrowedReference ob, IntPtr visit, IntPtr arg)
         {
-            var self = (ModuleObject)GetManagedObject(ob);
+            var self = (ModuleObject)GetManagedObject(ob)!;
             int res = PyVisit(self.dict, visit, arg);
             if (res != 0) return res;
             foreach (var attr in self.cache.Values)
@@ -346,7 +345,7 @@ protected override void Clear()
             if ((settableAttributes.Contains(managedKey)) || 
                 (ManagedType.GetManagedObject(val)?.GetType() == typeof(ModuleObject)) )
             {
-                var self = (ModuleObject)ManagedType.GetManagedObject(ob);
+                var self = (ModuleObject)ManagedType.GetManagedObject(ob)!;
                 return Runtime.PyDict_SetItem(self.dict, key, val);
             }
 
@@ -493,7 +492,7 @@ public static Assembly AddReference(string name)
         {
             AssemblyManager.UpdatePath();
             var origNs = AssemblyManager.GetNamespaces();
-            Assembly assembly = null;
+            Assembly? assembly = null;
             assembly = AssemblyManager.FindLoadedAssembly(name);
             if (assembly == null)
             {
@@ -579,11 +578,11 @@ public static string[] ListAssemblies(bool verbose)
         /// <returns>A new reference to the imported module, as a PyObject.</returns>
         [ModuleFunction]
         [ForbidPythonThreads]
-        public static ModuleObject _load_clr_module(PyObject spec)
+        public static PyObject _load_clr_module(PyObject spec)
         {
-            ModuleObject mod = null;
             using var modname = spec.GetAttr("name");
-            mod = ImportHook.Import(modname.ToString());
+            string name = modname.As<string?>() ?? throw new ArgumentException("name must not be None");
+            var mod = ImportHook.Import(name);
             return mod;
         }