Stylistic fixes

nsist/__init__.py

@@ -13,6 +13,7 @@ if PY2:
     from urllib import urlretrieve
 else:
     from urllib.request import urlretrieve
+
 if os.name == 'nt' and PY2:
     import _winreg as winreg
 elif os.name == 'nt':
@@ -138,12 +139,11 @@ def run_nsis(nsi_file):
         else:
             makensis = 'makensis'
         return call([makensis, nsi_file])
-    except OSError:
-        # OSError catches both the registry lookup failing and call() not
-        # finding makensis
-        print("makensis was not found. Install NSIS and try again.")
-        print("http://nsis.sourceforge.net/Download")
-        return 1
+    except OSError as e:
+        if e.errno == errno.ENOENT or isinstance(e, WindowsError):
+            print("makensis was not found. Install NSIS and try again.")
+            print("http://nsis.sourceforge.net/Download")
+            return 1
 
 def all_steps(appname, version, script=None, entry_point=None, icon=DEFAULT_ICON, console=False,
                 packages=None, extra_files=None, py_version=DEFAULT_PY_VERSION,
@@ -159,10 +159,7 @@ def all_steps(appname, version, script=None, entry_point=None, icon=DEFAULT_ICON
     try:
         os.makedirs(build_dir)
     except OSError as e:
-        if e.errno == errno.EEXIST:
-            # It's okay if the build directory already exists
-            pass
-        else:
+        if e.errno != errno.EEXIST:
             raise e
     fetch_python(version=py_version, bitness=py_bitness, destination=build_dir)
     if PY2:

nsist/copymodules.py

@@ -28,7 +28,8 @@ if not PY2:
     class ModuleCopier:
         """Finds and copies importable Python modules and packages.
 
-        This uses importlib to locate modules.
+        This is the Python >3.3 version and uses the `importlib` package to
+        locate modules.
         """
         def __init__(self, path=None):
             self.path = path if (path is not None) else ([''] + sys.path)
@@ -70,7 +71,8 @@ else:
     class ModuleCopier:
         """Finds and copies importable Python modules and packages.
 
-        This uses importlib to locate modules.
+        This is the Python 2.7 version and uses the `imp` package to locate
+        modules.
         """
         def __init__(self, path=None):
             self.path = path if (path is not None) else ([''] + sys.path)
@@ -86,14 +88,16 @@ else:
             and extract modules and packages from appropriately structured zip
             files.
             """
-            modinfo = imp.find_module(modname, self.path)
+            info = imp.find_module(modname, self.path)
+            path = info[1]
+            modtype = info[2][2]
 
-            if modinfo[2][2] in (imp.PY_SOURCE, imp.C_EXTENSION):
-                shutil.copy2(modinfo[1], target)
+            if modtype in (imp.PY_SOURCE, imp.C_EXTENSION):
+                shutil.copy2(path, target)
 
-            elif modinfo[2][2] == imp.PKG_DIRECTORY:
+            elif modtype == imp.PKG_DIRECTORY:
                 dest = os.path.join(target, modname)
-                shutil.copytree(modinfo[1], dest,
+                shutil.copytree(path, dest,
                                 ignore=shutil.ignore_patterns('*.pyc'))
             else:
                 # Search all ZIP files in self.path for the module name

nsist/nsiswriter.py

@@ -62,8 +62,7 @@ class NSISFileWriter(object):
     def write_pylauncher_install(self, f, indent):
         f.write(indent+"Section \"PyLauncher\" sec_pylauncher\n")
         f.write(indent+"File \"launchwin${ARCH_TAG}.msi\"\n")
-        f.write(indent+"ExecWait 'msiexec /i "
-                "\"$INSTDIR\launchwin${ARCH_TAG}.msi\" /qb ALLUSERS=1'\n")
+        f.write(indent+"ExecWait 'msiexec /i \"$INSTDIR\launchwin${ARCH_TAG}.msi\" /qb ALLUSERS=1'\n")
         f.write(indent+"Delete $INSTDIR\launchwin${ARCH_TAG}.msi\n")
         f.write(indent+"SectionEnd\n")
 

setup.py

@@ -31,6 +31,7 @@ setup(name='pynsist',
           'License :: OSI Approved :: MIT License',
           'Environment :: Win32 (MS Windows)',
           'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 2.7',
           'Topic :: Software Development',
           'Topic :: System :: Installation/Setup',
           'Topic :: System :: Software Distribution',