Syntax cleanup

vmuriart · vmuriart · commit 0e74f869ad1e · 2017-02-02T08:25:51.000-07:00
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -71,7 +71,7 @@ internal static void Initialize()
         /// </summary>
         internal static void Shutdown()
         {
-            if (0 != Runtime.Py_IsInitialized())
+            if (Runtime.Py_IsInitialized() != 0)
             {
                 Runtime.XDecref(py_clr_module);
                 Runtime.XDecref(root.pyHandle);
@@ -111,11 +111,11 @@ public static IntPtr GetCLRModule(IntPtr? fromList = null)
                                     continue;
 
                                 string s = item.AsManagedObject(typeof(string)) as string;
-                                if (null == s)
+                                if (s == null)
                                     continue;
 
                                 ManagedType attr = root.GetAttribute(s, true);
-                                if (null == attr)
+                                if (attr == null)
                                     continue;
 
                                 Runtime.XIncref(attr.pyHandle);
@@ -190,7 +190,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
             }
             if (mod_name == "CLR")
             {
-                Exceptions.deprecation("The CLR module is deprecated. " + "Please use 'clr'.");
+                Exceptions.deprecation("The CLR module is deprecated. Please use 'clr'.");
                 IntPtr clr_module = GetCLRModule(fromList);
                 if (clr_module != IntPtr.Zero)
                 {
@@ -305,9 +305,8 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
             ModuleObject tail = root;
             root.InitializePreload();
 
-            for (int i = 0; i < names.Length; i++)
+            foreach (string name in names)
             {
-                string name = names[i];
                 ManagedType mt = tail.GetAttribute(name, true);
                 if (!(mt is ModuleObject))
                 {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ internal static void Initialize()`
`71`	`71`	`/// </summary>`
`72`	`72`	`internal static void Shutdown()`
`73`	`73`	`{`
`74`		`- if (0 != Runtime.Py_IsInitialized())`
	`74`	`+ if (Runtime.Py_IsInitialized() != 0)`
`75`	`75`	`{`
`76`	`76`	`Runtime.XDecref(py_clr_module);`
`77`	`77`	`Runtime.XDecref(root.pyHandle);`
`@@ -111,11 +111,11 @@ public static IntPtr GetCLRModule(IntPtr? fromList = null)`
`111`	`111`	`continue;`
`112`	`112`
`113`	`113`	`string s = item.AsManagedObject(typeof(string)) as string;`
`114`		`- if (null == s)`
	`114`	`+ if (s == null)`
`115`	`115`	`continue;`
`116`	`116`
`117`	`117`	`ManagedType attr = root.GetAttribute(s, true);`
`118`		`- if (null == attr)`
	`118`	`+ if (attr == null)`
`119`	`119`	`continue;`
`120`	`120`
`121`	`121`	`Runtime.XIncref(attr.pyHandle);`
`@@ -190,7 +190,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`190`	`190`	`}`
`191`	`191`	`if (mod_name == "CLR")`
`192`	`192`	`{`
`193`		`- Exceptions.deprecation("The CLR module is deprecated. " + "Please use 'clr'.");`
	`193`	`+ Exceptions.deprecation("The CLR module is deprecated. Please use 'clr'.");`
`194`	`194`	`IntPtr clr_module = GetCLRModule(fromList);`
`195`	`195`	`if (clr_module != IntPtr.Zero)`
`196`	`196`	`{`
`@@ -305,9 +305,8 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`305`	`305`	`ModuleObject tail = root;`
`306`	`306`	`root.InitializePreload();`
`307`	`307`
`308`		`- for (int i = 0; i < names.Length; i++)`
	`308`	`+ foreach (string name in names)`
`309`	`309`	`{`
`310`		`- string name = names[i];`
`311`	`310`	`ManagedType mt = tail.GetAttribute(name, true);`
`312`	`311`	`if (!(mt is ModuleObject))`
`313`	`312`	`{`