Clean: Remove some nesting levels.

pyinstaller · Mar 27, 2012 · 475756a · 475756a
1 parent 57e96e8
commit 475756a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 43 deletions.
diff --git a/PyInstaller/depend/impdirector.py b/PyInstaller/depend/impdirector.py
@@ -69,26 +69,27 @@ def __init__(self):
             import win32api
             import win32con
         except ImportError:
-            pass
+            return
-        else:
+
-            subkey = r"Software\Python\PythonCore\%s\Modules" % sys.winver
+        subkey = r"Software\Python\PythonCore\%s\Modules" % sys.winver
-            for root in (win32con.HKEY_CURRENT_USER, win32con.HKEY_LOCAL_MACHINE):
+        for root in (win32con.HKEY_CURRENT_USER, win32con.HKEY_LOCAL_MACHINE):
-                try:
+            try:
-                    hkey = win32api.RegOpenKeyEx(root, subkey, 0, win32con.KEY_READ)
+                hkey = win32api.RegOpenKeyEx(root, subkey, 0, win32con.KEY_READ)
-                except Exception, e:
+            except Exception, e:
-                    logger.debug('RegistryImportDirector: %s' % e)
+                logger.debug('RegistryImportDirector: %s' % e)
-                else:
+                continue
-                    numsubkeys, numvalues, lastmodified = win32api.RegQueryInfoKey(hkey)
+
-                    for i in range(numsubkeys):
+            numsubkeys, numvalues, lastmodified = win32api.RegQueryInfoKey(hkey)
-                        subkeyname = win32api.RegEnumKey(hkey, i)
+            for i in range(numsubkeys):
-                        hskey = win32api.RegOpenKeyEx(hkey, subkeyname, 0, win32con.KEY_READ)
+                subkeyname = win32api.RegEnumKey(hkey, i)
-                        val = win32api.RegQueryValueEx(hskey, '')
+                hskey = win32api.RegOpenKeyEx(hkey, subkeyname, 0, win32con.KEY_READ)
-                        desc = getDescr(val[0])
+                val = win32api.RegQueryValueEx(hskey, '')
-                        #print " RegistryImportDirector got %s %s" % (val[0], desc)  #XXX
+                desc = getDescr(val[0])
-                        self.map[subkeyname] = (val[0], desc)
+                #print " RegistryImportDirector got %s %s" % (val[0], desc)  #XXX
-                        hskey.Close()
+                self.map[subkeyname] = (val[0], desc)
-                    hkey.Close()
+                hskey.Close()
-                    break
+            hkey.Close()
+            break
 
     def getmod(self, nm, loadco=marshal.loads):
         stuff = self.map.get(nm)

diff --git a/PyInstaller/loader/iu.py b/PyInstaller/loader/iu.py
@@ -231,29 +231,29 @@ def __init__(self):
         try:
             import win32api
         except ImportError:
-            pass
+            return
-        else:
+
-            HKEY_CURRENT_USER = -2147483647
+        HKEY_CURRENT_USER = -2147483647
-            HKEY_LOCAL_MACHINE = -2147483646
+        HKEY_LOCAL_MACHINE = -2147483646
-            KEY_READ = 131097
+        KEY_READ = 131097
-            subkey = r"Software\Python\PythonCore\%s\Modules" % sys.winver
+        subkey = r"Software\Python\PythonCore\%s\Modules" % sys.winver
-            for root in (HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE):
+        for root in (HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE):
-                try:
+            try:
-                    hkey = win32api.RegOpenKeyEx(root, subkey, 0, KEY_READ)
+                hkey = win32api.RegOpenKeyEx(root, subkey, 0, KEY_READ)
-                except Exception:
+            except Exception:
-                    # If the key does not exist, simply try the next one.
+                # If the key does not exist, simply try the next one.
-                    pass
+                continue
-                else:
+
-                    numsubkeys, numvalues, lastmodified = win32api.RegQueryInfoKey(hkey)
+            numsubkeys, numvalues, lastmodified = win32api.RegQueryInfoKey(hkey)
-                    for i in range(numsubkeys):
+            for i in range(numsubkeys):
-                        subkeyname = win32api.RegEnumKey(hkey, i)
+                subkeyname = win32api.RegEnumKey(hkey, i)
-                        hskey = win32api.RegOpenKeyEx(hkey, subkeyname, 0, KEY_READ)
+                hskey = win32api.RegOpenKeyEx(hkey, subkeyname, 0, KEY_READ)
-                        val = win32api.RegQueryValueEx(hskey, '')
+                val = win32api.RegQueryValueEx(hskey, '')
-                        desc = getDescr(val[0])
+                desc = getDescr(val[0])
-                        self.map[subkeyname] = (val[0], desc)
+                self.map[subkeyname] = (val[0], desc)
-                        hskey.Close()
+                hskey.Close()
-                    hkey.Close()
+            hkey.Close()
-                    break
+            break
 
     def getmod(self, nm):
         stuff = self.map.get(nm)