Drop the long-deprecated CLR.* alias

filmor · filmor · commit 008c5fe74c81 · 2020-12-12T20:41:14.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ details about the cause of the failure
      if you need to "downcast" to the implementation class.
 -   BREAKING: Parameters marked with `ParameterAttributes.Out` are no longer returned in addition
      to the regular method return value (unless they are passed with `ref` or `out` keyword).
+-   BREAKING: Drop support for the long-deprecated CLR.* prefix.
 
 ### Fixed
 
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -124,7 +124,7 @@ internal static void Shutdown()
 
         internal static void SaveRuntimeData(RuntimeDataStorage storage)
         {
-            // Increment the reference counts here so that the objects don't 
+            // Increment the reference counts here so that the objects don't
             // get freed in Shutdown.
             Runtime.XIncref(py_clr_module);
             Runtime.XIncref(root.pyHandle);
@@ -241,12 +241,8 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
             // Check these BEFORE the built-in import runs; may as well
             // do the Incref()ed return here, since we've already found
             // the module.
-            if (mod_name == "clr" || mod_name == "CLR")
+            if (mod_name == "clr")
             {
-                if (mod_name == "CLR")
-                {
-                    Exceptions.deprecation("The CLR module is deprecated. Please use 'clr'.");
-                }
                 IntPtr clr_module = GetCLRModule(fromList);
                 if (clr_module != IntPtr.Zero)
                 {
@@ -262,51 +258,41 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
             string realname = mod_name;
             string clr_prefix = null;
 
-            if (mod_name.StartsWith("CLR."))
+            // 2010-08-15: Always seemed smart to let python try first...
+            // This shaves off a few tenths of a second on test_module.py
+            // and works around a quirk where 'sys' is found by the
+            // LoadImplicit() deprecation logic.
+            // Turns out that the AssemblyManager.ResolveHandler() checks to see if any
+            // Assembly's FullName.ToLower().StartsWith(name.ToLower()), which makes very
+            // little sense to me.
+            IntPtr res = Runtime.PyObject_Call(py_import, args, kw);
+            if (res != IntPtr.Zero)
             {
-                clr_prefix = "CLR."; // prepend when adding the module to sys.modules
-                realname = mod_name.Substring(4);
-                string msg = $"Importing from the CLR.* namespace is deprecated. Please import '{realname}' directly.";
-                Exceptions.deprecation(msg);
-            }
-            else
-            {
-                // 2010-08-15: Always seemed smart to let python try first...
-                // This shaves off a few tenths of a second on test_module.py
-                // and works around a quirk where 'sys' is found by the
-                // LoadImplicit() deprecation logic.
-                // Turns out that the AssemblyManager.ResolveHandler() checks to see if any
-                // Assembly's FullName.ToLower().StartsWith(name.ToLower()), which makes very
-                // little sense to me.
-                IntPtr res = Runtime.PyObject_Call(py_import, args, kw);
-                if (res != IntPtr.Zero)
+                // There was no error.
+                if (fromlist && IsLoadAll(fromList))
                 {
-                    // There was no error.
-                    if (fromlist && IsLoadAll(fromList))
-                    {
-                        var mod = ManagedType.GetManagedObject(res) as ModuleObject;
-                        mod?.LoadNames();
-                    }
-                    return res;
-                }
-                // There was an error
-                if (!Exceptions.ExceptionMatches(Exceptions.ImportError))
-                {
-                    // and it was NOT an ImportError; bail out here.
-                    return IntPtr.Zero;
+                    var mod = ManagedType.GetManagedObject(res) as ModuleObject;
+                    mod?.LoadNames();
                 }
+                return res;
+            }
+            // There was an error
+            if (!Exceptions.ExceptionMatches(Exceptions.ImportError))
+            {
+                // and it was NOT an ImportError; bail out here.
+                return IntPtr.Zero;
+            }
 
-                if (mod_name == string.Empty)
-                {
-                    // Most likely a missing relative import.
-                    // For example site-packages\bs4\builder\__init__.py uses it to check if a package exists:
-                    //     from . import _html5lib
-                    // We don't support them anyway
-                    return IntPtr.Zero;
-                }
-                // Otherwise,  just clear the it.
-                Exceptions.Clear();
+            if (mod_name == string.Empty)
+            {
+                // Most likely a missing relative import.
+                // For example site-packages\bs4\builder\__init__.py uses it to check if a package exists:
+                //     from . import _html5lib
+                // We don't support them anyway
+                return IntPtr.Zero;
             }
+            // Otherwise,  just clear the it.
+            Exceptions.Clear();
 
             string[] names = realname.Split('.');
 
@@ -372,7 +358,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
                 // Add the module to sys.modules
                 Runtime.PyDict_SetItemString(modules, tail.moduleName, tail.pyHandle);
 
-                // If imported from CLR add CLR.<modulename> to sys.modules as well
+                // If imported from CLR add clr.<modulename> to sys.modules as well
                 if (clr_prefix != null)
                 {
                     Runtime.PyDict_SetItemString(modules, clr_prefix + tail.moduleName, tail.pyHandle);
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -492,7 +492,6 @@ private static void ClearClrModules()
         private static void RemoveClrRootModule()
         {
             var modules = PyImport_GetModuleDict();
-            PyDictTryDelItem(modules, "CLR");
             PyDictTryDelItem(modules, "clr");
             PyDictTryDelItem(modules, "clr._extra");
         }
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -176,7 +176,7 @@ internal static IntPtr CreateType(Type impl)
         internal static IntPtr CreateType(ManagedType impl, Type clrType)
         {
             // Cleanup the type name to get rid of funny nested type names.
-            string name = "CLR." + clrType.FullName;
+            string name = $"clr.{clrType.FullName}";
             int i = name.LastIndexOf('+');
             if (i > -1)
             {
diff --git a/src/testing/threadtest.cs b/src/testing/threadtest.cs
@@ -11,8 +11,8 @@ public class ThreadTest
         private static PyObject module;
 
         private static string testmod =
-            "import CLR\n" +
-            "from CLR.Python.Test import ThreadTest\n" +
+            "import clr\n" +
+            "from Python.Test import ThreadTest\n" +
             "\n" +
             "def echostring(value):\n" +
             "    return value\n" +
diff --git a/src/tests/test_clrmethod.py b/src/tests/test_clrmethod.py
@@ -14,7 +14,7 @@ def __init__(self):
     @clr.clrmethod(int, [int])
     def test(self, x):
         return x*2
-    
+
     def get_X(self):
         return self._x
     def set_X(self, value):
diff --git a/src/tests/test_compat.py b/src/tests/test_compat.py
diff --git a/src/tests/test_exceptions.py b/src/tests/test_exceptions.py
diff --git a/src/tests/test_method.py b/src/tests/test_method.py

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,6 @@ private static void ClearClrModules()`
`492`	`492`	`private static void RemoveClrRootModule()`
`493`	`493`	`{`
`494`	`494`	`var modules = PyImport_GetModuleDict();`
`495`		`- PyDictTryDelItem(modules, "CLR");`
`496`	`495`	`PyDictTryDelItem(modules, "clr");`
`497`	`496`	`PyDictTryDelItem(modules, "clr._extra");`
`498`	`497`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ internal static IntPtr CreateType(Type impl)`
`176`	`176`	`internal static IntPtr CreateType(ManagedType impl, Type clrType)`
`177`	`177`	`{`
`178`	`178`	`// Cleanup the type name to get rid of funny nested type names.`
`179`		`- string name = "CLR." + clrType.FullName;`
	`179`	`+ string name = $"clr.{clrType.FullName}";`
`180`	`180`	`int i = name.LastIndexOf('+');`
`181`	`181`	`if (i > -1)`
`182`	`182`	`{`