Forráskód Böngészése

More code eliminated

Thomas Kluyver 7 éve
szülő
commit
12b274c74e
2 módosított fájl, 1 hozzáadás és 6 törlés
  1. 0 1
      nsist/configreader.py
  2. 1 5
      nsist/nsiswriter.py

+ 0 - 1
nsist/configreader.py

@@ -223,7 +223,6 @@ def get_installer_builder_args(config):
     args['extra_files'] = read_extra_files(config)
     args['py_version'] = config.get('Python', 'version', fallback=DEFAULT_PY_VERSION)
     args['py_bitness'] = config.getint('Python', 'bitness', fallback=DEFAULT_BITNESS)
-    args['py_format'] = config.get('Python', 'format', fallback=None)
     args['inc_msvcrt'] = config.getboolean('Python', 'include_msvcrt', fallback=True)
     args['build_dir'] = config.get('Build', 'directory', fallback=DEFAULT_BUILD_DIR)
     args['installer_name'] = config.get('Build', 'installer_name', fallback=None)

+ 1 - 5
nsist/nsiswriter.py

@@ -56,13 +56,9 @@ class NSISFileWriter(object):
             'single_shortcut': len(installerbuilder.shortcuts) == 1,
             'pynsist_pkg_dir': _PKGDIR,
             'has_commands': len(installerbuilder.commands) > 0,
+            'python': '"$INSTDIR\\Python\\python"'
         }
 
-        if installerbuilder.py_format == 'bundled':
-            self.namespace['python'] = '"$INSTDIR\\Python\\python"'
-        else:
-            self.namespace['python'] = 'py -{}'.format(installerbuilder.py_qualifier)
-
     def write(self, target):
         """Fill out the template and write the result to 'target'.