Fix debug statement & rename debugprint

vmuriart · vmuriart · commit 4fe44c4873a6 · 2017-02-06T11:02:01.000-07:00
diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs
@@ -38,7 +38,7 @@ public static IntPtr PyInit_clr()
     public static void initclr()
 #endif
     {
-        debugPrint("Attempting to load 'Python.Runtime' using standard binding rules.");
+        DebugPrint("Attempting to load 'Python.Runtime' using standard binding rules.");
 #if USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN
         var pythonRuntimePublicKeyTokenData = new byte[] { 0x50, 0x00, 0xfe, 0xa6, 0xcb, 0xa7, 0x02, 0xdd };
 #endif
@@ -64,11 +64,11 @@ public static void initclr()
         try
         {
             pythonRuntime = Assembly.Load(pythonRuntimeName);
-            debugPrint("Success loading 'Python.Runtime' using standard binding rules.");
+            DebugPrint("Success loading 'Python.Runtime' using standard binding rules.");
         }
         catch (IOException)
         {
-            debugPrint("'Python.Runtime' not found using standard binding rules.");
+            DebugPrint("'Python.Runtime' not found using standard binding rules.");
             try
             {
                 // If the above fails for any reason, we fallback to attempting to load "Python.Runtime.dll"
@@ -87,13 +87,13 @@ public static void initclr()
                     throw new InvalidOperationException(executingAssembly.Location);
                 }
                 string pythonRuntimeDllPath = Path.Combine(assemblyDirectory, "Python.Runtime.dll");
-                debugPrint($"Attempting to load Python.Runtime from: '{pythonRuntimeDllPath}.'");
+                DebugPrint($"Attempting to load Python.Runtime from: '{pythonRuntimeDllPath}'.");
                 pythonRuntime = Assembly.LoadFrom(pythonRuntimeDllPath);
-                debugPrint($"Success loading 'Python.Runtime' from: '{pythonRuntimeDllPath}'.");
+                DebugPrint($"Success loading 'Python.Runtime' from: '{pythonRuntimeDllPath}'.");
             }
             catch (InvalidOperationException)
             {
-                debugPrint("Could not load 'Python.Runtime'.");
+                DebugPrint("Could not load 'Python.Runtime'.");
 #if PYTHON3
                 return IntPtr.Zero;
 #elif PYTHON2
@@ -118,7 +118,7 @@ public static void initclr()
     /// but haven't been able to configure the TRACE from within Python.
     /// </summary>
     [Conditional("DEBUG")]
-    private static void debugPrint(string str)
+    private static void DebugPrint(string str)
     {
         Console.WriteLine(str);
     }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static IntPtr PyInit_clr()`
`38`	`38`	`public static void initclr()`
`39`	`39`	`#endif`
`40`	`40`	`{`
`41`		`- debugPrint("Attempting to load 'Python.Runtime' using standard binding rules.");`
	`41`	`+ DebugPrint("Attempting to load 'Python.Runtime' using standard binding rules.");`
`42`	`42`	`#if USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN`
`43`	`43`	`var pythonRuntimePublicKeyTokenData = new byte[] { 0x50, 0x00, 0xfe, 0xa6, 0xcb, 0xa7, 0x02, 0xdd };`
`44`	`44`	`#endif`
`@@ -64,11 +64,11 @@ public static void initclr()`
`64`	`64`	`try`
`65`	`65`	`{`
`66`	`66`	`pythonRuntime = Assembly.Load(pythonRuntimeName);`
`67`		`- debugPrint("Success loading 'Python.Runtime' using standard binding rules.");`
	`67`	`+ DebugPrint("Success loading 'Python.Runtime' using standard binding rules.");`
`68`	`68`	`}`
`69`	`69`	`catch (IOException)`
`70`	`70`	`{`
`71`		`- debugPrint("'Python.Runtime' not found using standard binding rules.");`
	`71`	`+ DebugPrint("'Python.Runtime' not found using standard binding rules.");`
`72`	`72`	`try`
`73`	`73`	`{`
`74`	`74`	`// If the above fails for any reason, we fallback to attempting to load "Python.Runtime.dll"`
`@@ -87,13 +87,13 @@ public static void initclr()`
`87`	`87`	`throw new InvalidOperationException(executingAssembly.Location);`
`88`	`88`	`}`
`89`	`89`	`string pythonRuntimeDllPath = Path.Combine(assemblyDirectory, "Python.Runtime.dll");`
`90`		`- debugPrint($"Attempting to load Python.Runtime from: '{pythonRuntimeDllPath}.'");`
	`90`	`+ DebugPrint($"Attempting to load Python.Runtime from: '{pythonRuntimeDllPath}'.");`
`91`	`91`	`pythonRuntime = Assembly.LoadFrom(pythonRuntimeDllPath);`
`92`		`- debugPrint($"Success loading 'Python.Runtime' from: '{pythonRuntimeDllPath}'.");`
	`92`	`+ DebugPrint($"Success loading 'Python.Runtime' from: '{pythonRuntimeDllPath}'.");`
`93`	`93`	`}`
`94`	`94`	`catch (InvalidOperationException)`
`95`	`95`	`{`
`96`		`- debugPrint("Could not load 'Python.Runtime'.");`
	`96`	`+ DebugPrint("Could not load 'Python.Runtime'.");`
`97`	`97`	`#if PYTHON3`
`98`	`98`	`return IntPtr.Zero;`
`99`	`99`	`#elif PYTHON2`
`@@ -118,7 +118,7 @@ public static void initclr()`
`118`	`118`	`/// but haven't been able to configure the TRACE from within Python.`
`119`	`119`	`/// </summary>`
`120`	`120`	`[Conditional("DEBUG")]`
`121`		`- private static void debugPrint(string str)`
	`121`	`+ private static void DebugPrint(string str)`
`122`	`122`	`{`
`123`	`123`	`Console.WriteLine(str);`
`124`	`124`	`}`