ImportHook: drop dead code around clr_prefix

lostmsu · lostmsu · commit 9358531f287b · 2021-02-25T16:48:18.000-08:00
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -258,7 +258,6 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)
             }
 
             string realname = mod_name;
-            string clr_prefix = null;
 
             // 2010-08-15: Always seemed smart to let python try first...
             // This shaves off a few tenths of a second on test_module.py
@@ -316,10 +315,7 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)
                     }
                     return new NewReference(module).DangerousMoveToPointer();
                 }
-                if (clr_prefix != null)
-                {
-                    return GetCLRModule(fromList).DangerousMoveToPointerOrNull();
-                }
+
                 module = Runtime.PyDict_GetItemString(modules, names[0]);
                 return new NewReference(module, canBeNull: true).DangerousMoveToPointer();
             }
@@ -359,12 +355,6 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)
 
                 // Add the module to sys.modules
                 Runtime.PyDict_SetItemString(modules, tail.moduleName, tail.ObjectReference);
-
-                // 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.ObjectReference);
-                }
             }
 
             {

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,6 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`string realname = mod_name;`
`261`		`- string clr_prefix = null;`
`262`	`261`
`263`	`262`	`// 2010-08-15: Always seemed smart to let python try first...`
`264`	`263`	`// This shaves off a few tenths of a second on test_module.py`
`@@ -316,10 +315,7 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)`
`316`	`315`	`}`
`317`	`316`	`return new NewReference(module).DangerousMoveToPointer();`
`318`	`317`	`}`
`319`		`- if (clr_prefix != null)`
`320`		`- {`
`321`		`- return GetCLRModule(fromList).DangerousMoveToPointerOrNull();`
`322`		`- }`
	`318`	`+`
`323`	`319`	`module = Runtime.PyDict_GetItemString(modules, names[0]);`
`324`	`320`	`return new NewReference(module, canBeNull: true).DangerousMoveToPointer();`
`325`	`321`	`}`
`@@ -359,12 +355,6 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)`
`359`	`355`
`360`	`356`	`// Add the module to sys.modules`
`361`	`357`	`Runtime.PyDict_SetItemString(modules, tail.moduleName, tail.ObjectReference);`
`362`		`-`
`363`		`- // If imported from CLR add clr.<modulename> to sys.modules as well`
`364`		`- if (clr_prefix != null)`
`365`		`- {`
`366`		`- Runtime.PyDict_SetItemString(modules, clr_prefix + tail.moduleName, tail.ObjectReference);`
`367`		`- }`
`368`	`358`	`}`
`369`	`359`
`370`	`360`	`{`