pythonnet · filmor · Mar 4, 2022 · Mar 10, 2022 · Mar 10, 2022 · Mar 29, 2022
diff --git a/pythonnet/__init__.py b/pythonnet/__init__.py
@@ -36,11 +36,11 @@ def load():
         set_default_runtime()
 
     dll_path = join(dirname(__file__), "runtime", "Python.Runtime.dll")
-    
+
     _LOADER_ASSEMBLY = _RUNTIME.get_assembly(dll_path)
 
     func = _LOADER_ASSEMBLY["Python.Runtime.Loader.Initialize"]
-    if func(''.encode("utf8")) != 0:
+    if func(b"") != 0:
         raise RuntimeError("Failed to initialize Python.Runtime.dll")
 
     import atexit
@@ -51,7 +51,7 @@ def unload():
     global _RUNTIME
     if _LOADER_ASSEMBLY is not None:
         func = _LOADER_ASSEMBLY["Python.Runtime.Loader.Shutdown"]
-        if func(b"") != 0:
+        if func(b"full_shutdown") != 0:
             raise RuntimeError("Failed to call Python.NET shutdown")
 
     if _RUNTIME is not None:

diff --git a/src/runtime/AssemblyManager.cs b/src/runtime/AssemblyManager.cs
@@ -23,8 +23,8 @@ internal class AssemblyManager
         //    than it can end up referring to assemblies that are already unloaded (default behavior after unload appDomain -
         //     unless LoaderOptimization.MultiDomain is used);
         //    So for multidomain support it is better to have the dict. recreated for each app-domain initialization
-        private static ConcurrentDictionary<string, ConcurrentDictionary<Assembly, string>> namespaces =
-            new ConcurrentDictionary<string, ConcurrentDictionary<Assembly, string>>();
+        private static readonly ConcurrentDictionary<string, ConcurrentDictionary<Assembly, string>> namespaces =
+            new();
 
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         // domain-level handlers are initialized in Initialize
@@ -33,7 +33,7 @@ internal class AssemblyManager
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
         // updated only under GIL?
-        private static Dictionary<string, int> probed = new Dictionary<string, int>(32);
+        private static readonly Dictionary<string, int> probed = new(32);
 
         // modified from event handlers below, potentially triggered from different .NET threads
         private static readonly ConcurrentQueue<Assembly> assemblies = new();

diff --git a/src/runtime/ClassManager.cs b/src/runtime/ClassManager.cs
@@ -247,10 +247,9 @@ internal static void InitClassBase(Type type, ClassBase impl, ReflectedClrType p
                 Runtime.PyDict_SetItem(dict, PyIdentifier.__doc__, doc.Borrow());
             }
 
-            var co = impl as ClassObject;
             // If this is a ClassObject AND it has constructors, generate a __doc__ attribute.
             // required that the ClassObject.ctors be changed to internal
-            if (co != null)
+            if (impl is ClassObject co)
             {
                 if (co.NumCtors > 0 && !co.HasCustomNew())
                 {

diff --git a/src/runtime/Codecs/DecoderGroup.cs b/src/runtime/Codecs/DecoderGroup.cs
@@ -10,7 +10,7 @@ namespace Python.Runtime.Codecs
     /// </summary>
     public sealed class DecoderGroup: IPyObjectDecoder, IEnumerable<IPyObjectDecoder>, IDisposable
     {
-        readonly List<IPyObjectDecoder> decoders = new List<IPyObjectDecoder>();
+        readonly List<IPyObjectDecoder> decoders = new();
 
         /// <summary>
         /// Add specified decoder to the group

diff --git a/src/runtime/Codecs/EncoderGroup.cs b/src/runtime/Codecs/EncoderGroup.cs
@@ -10,7 +10,7 @@ namespace Python.Runtime.Codecs
     /// </summary>
     public sealed class EncoderGroup: IPyObjectEncoder, IEnumerable<IPyObjectEncoder>, IDisposable
     {
-        readonly List<IPyObjectEncoder> encoders = new List<IPyObjectEncoder>();
+        readonly List<IPyObjectEncoder> encoders = new();
 
         /// <summary>
         /// Add specified encoder to the group

diff --git a/src/runtime/Codecs/PyObjectConversions.cs b/src/runtime/Codecs/PyObjectConversions.cs
@@ -15,8 +15,8 @@ namespace Python.Runtime
     /// </summary>
     public static class PyObjectConversions
     {
-        static readonly DecoderGroup decoders = new DecoderGroup();
-        static readonly EncoderGroup encoders = new EncoderGroup();
+        static readonly DecoderGroup decoders = new();
+        static readonly EncoderGroup encoders = new();
 
         /// <summary>
         /// Registers specified encoder (marshaller)
@@ -62,7 +62,7 @@ public static void RegisterDecoder(IPyObjectDecoder decoder)
         }
 
         static readonly ConcurrentDictionary<Type, IPyObjectEncoder[]>
-            clrToPython = new ConcurrentDictionary<Type, IPyObjectEncoder[]>();
+            clrToPython = new();
         static IPyObjectEncoder[] GetEncoders(Type type)
         {
             lock (encoders)

diff --git a/src/runtime/Converter.cs b/src/runtime/Converter.cs
@@ -18,15 +18,15 @@ private Converter()
         {
         }
 
-        private static Type objectType;
-        private static Type stringType;
-        private static Type singleType;
-        private static Type doubleType;
-        private static Type int16Type;
-        private static Type int32Type;
-        private static Type int64Type;
-        private static Type boolType;
-        private static Type typeType;
+        private static readonly Type objectType;
+        private static readonly Type stringType;
+        private static readonly Type singleType;
+        private static readonly Type doubleType;
+        private static readonly Type int16Type;
+        private static readonly Type int32Type;
+        private static readonly Type int64Type;
+        private static readonly Type boolType;
+        private static readonly Type typeType;
 
         static Converter()
         {
@@ -151,8 +151,7 @@ internal static NewReference ToPython(object? value, Type type)
 
             // it the type is a python subclass of a managed type then return the
             // underlying python object rather than construct a new wrapper object.
-            var pyderived = value as IPythonDerivedType;
-            if (null != pyderived)
+            if (value is IPythonDerivedType pyderived)
             {
                 if (!IsTransparentProxy(pyderived))
                     return ClassDerivedObject.ToPython(pyderived);
@@ -161,7 +160,7 @@ internal static NewReference ToPython(object? value, Type type)
             // ModuleObjects are created in a way that their wrapping them as
             // a CLRObject fails, the ClassObject has no tpHandle. Return the
             // pyHandle as is, do not convert.
-            if (value is ModuleObject modobj)
+            if (value is ModuleObject)
             {
                 throw new NotImplementedException();
             }

diff --git a/src/runtime/DelegateManager.cs b/src/runtime/DelegateManager.cs
@@ -15,13 +15,13 @@ namespace Python.Runtime
     /// </summary>
     internal class DelegateManager
     {
-        private readonly Dictionary<Type,Type> cache = new Dictionary<Type, Type>();
+        private readonly Dictionary<Type,Type> cache = new();
         private readonly Type basetype = typeof(Dispatcher);
         private readonly Type arrayType = typeof(object[]);
         private readonly Type voidtype = typeof(void);
         private readonly Type typetype = typeof(Type);
         private readonly Type pyobjType = typeof(PyObject);
-        private readonly CodeGenerator codeGenerator = new CodeGenerator();
+        private readonly CodeGenerator codeGenerator = new();
         private readonly ConstructorInfo arrayCtor;
         private readonly MethodInfo dispatch;
 
@@ -309,7 +309,7 @@ protected Dispatcher(PyObject target, Type dtype)
                         {
                             tpName += $" of size {Runtime.PyTuple_Size(op)}";
                         }
-                        StringBuilder sb = new StringBuilder();
+                        var sb = new StringBuilder();
                         if (!isVoid) sb.Append(rtype.FullName);
                         for (int i = 0; i < pi.Length; i++)
                         {

diff --git a/src/runtime/Exceptions.cs b/src/runtime/Exceptions.cs
@@ -196,8 +196,7 @@ public static bool SetError(Exception e)
             // might get a managed exception raised that is a wrapper for a
             // Python exception. In that case we'd rather have the real thing.
 
-            var pe = e as PythonException;
-            if (pe != null)
+            if (e is PythonException pe)
             {
                 pe.Restore();
                 return true;

diff --git a/src/runtime/Finalizer.cs b/src/runtime/Finalizer.cs
@@ -41,7 +41,7 @@ public ErrorArgs(Exception error)
         [DefaultValue(true)]
         public bool Enable { get; set; } = true;
 
-        private ConcurrentQueue<PendingFinalization> _objQueue = new();
+        private readonly ConcurrentQueue<PendingFinalization> _objQueue = new();
         private readonly ConcurrentQueue<PendingFinalization> _derivedQueue = new();
         private readonly ConcurrentQueue<Py_buffer> _bufferQueue = new();
         private int _throttled;

diff --git a/src/runtime/InternString.cs b/src/runtime/InternString.cs
@@ -61,8 +61,7 @@ public static void Shutdown()
 
         public static string? GetManagedString(BorrowedReference op)
         {
-            string s;
-            if (TryGetInterned(op, out s))
+            if (TryGetInterned(op, out string s))
             {
                 return s;
             }

diff --git a/src/runtime/Interop.cs b/src/runtime/Interop.cs
@@ -139,7 +139,7 @@ internal static Type GetPrototype(MethodInfo method)
         }
 
 
-        internal static Dictionary<IntPtr, Delegate> allocatedThunks = new Dictionary<IntPtr, Delegate>();
+        internal static Dictionary<IntPtr, Delegate> allocatedThunks = new();
 
         internal static ThunkInfo GetThunk(MethodInfo method)
         {

diff --git a/src/runtime/InteropConfiguration.cs b/src/runtime/InteropConfiguration.cs
@@ -9,7 +9,7 @@ namespace Python.Runtime
     public sealed class InteropConfiguration: IDisposable
     {
         internal readonly PythonBaseTypeProviderGroup pythonBaseTypeProviders
-            = new PythonBaseTypeProviderGroup();
+            = new();
 
         /// <summary>Enables replacing base types of CLR types as seen from Python</summary>
         public IList<IPythonBaseTypeProvider> PythonBaseTypeProviders => this.pythonBaseTypeProviders;

diff --git a/src/runtime/Loader.cs b/src/runtime/Loader.cs
@@ -23,18 +23,8 @@ public unsafe static int Initialize(IntPtr data, int size)
                     PythonDLL = null;
                 }
 
-                var gs = PyGILState_Ensure();
-
-                try
-                {
-                    // Console.WriteLine("Startup thread");
-                    PythonEngine.InitExt();
-                    // Console.WriteLine("Startup finished");
-                }
-                finally
-                {
-                    PyGILState_Release(gs);
-                }
+                using var _ = Py.GIL();
+                PythonEngine.InitExt();
             }
             catch (Exception exc)
             {
@@ -55,15 +45,8 @@ public unsafe static int Shutdown(IntPtr data, int size)
 
                 if (command == "full_shutdown")
                 {
-                    var gs = PyGILState_Ensure();
-                    try
-                    {
-                        PythonEngine.Shutdown();
-                    }
-                    finally
-                    {
-                        PyGILState_Release(gs);
-                    }
+                    using var _ = Py.GIL();
+                    PythonEngine.Shutdown();
                 }
             }
             catch (Exception exc)
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,7 +139,7 @@ internal static Type GetPrototype(MethodInfo method) @@
             }
-            internal static Dictionary<IntPtr, Delegate> allocatedThunks = new Dictionary<IntPtr, Delegate>();
+            internal static Dictionary<IntPtr, Delegate> allocatedThunks = new();
             internal static ThunkInfo GetThunk(MethodInfo method)
             {
@@ Expand Down @@