diff options
author | Éric Araujo <merwok@netwok.org> | 2011-09-10 16:14:08 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-09-10 16:14:08 (GMT) |
commit | c6d52eddaaa5fb8b8091480103188beda35a9f60 (patch) | |
tree | 7829475e86335d6bcbd4ad2b29bc730d38843512 /Lib/packaging | |
parent | 030cfe26a336826d08362cd60c8ea4be7775844b (diff) | |
download | cpython-c6d52eddaaa5fb8b8091480103188beda35a9f60.zip cpython-c6d52eddaaa5fb8b8091480103188beda35a9f60.tar.gz cpython-c6d52eddaaa5fb8b8091480103188beda35a9f60.tar.bz2 |
Fix usage of bytes in packaging's bdist_wininst.
This is copied from the namesake distutils command; there is no
automated test, so buildbots won’t call for my head this time, but it
should be okay as Python 3 users have tested the distutils command.
Diffstat (limited to 'Lib/packaging')
-rw-r--r-- | Lib/packaging/command/bdist_wininst.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Lib/packaging/command/bdist_wininst.py b/Lib/packaging/command/bdist_wininst.py index 4ba2b2d..6c1e225 100644 --- a/Lib/packaging/command/bdist_wininst.py +++ b/Lib/packaging/command/bdist_wininst.py @@ -1,7 +1,5 @@ """Create an executable installer for Windows.""" -# FIXME synchronize bytes/str use with same file in distutils - import sys import os @@ -264,14 +262,17 @@ class bdist_wininst(Command): cfgdata = cfgdata.encode("mbcs") # Append the pre-install script - cfgdata = cfgdata + "\0" + cfgdata = cfgdata + b"\0" if self.pre_install_script: - with open(self.pre_install_script) as fp: - script_data = fp.read() - cfgdata = cfgdata + script_data + "\n\0" + # We need to normalize newlines, so we open in text mode and + # convert back to bytes. "latin-1" simply avoids any possible + # failures. + with open(self.pre_install_script, encoding="latin-1") as fp: + script_data = fp.read().encode("latin-1") + cfgdata = cfgdata + script_data + b"\n\0" else: # empty pre-install script - cfgdata = cfgdata + "\0" + cfgdata = cfgdata + b"\0" file.write(cfgdata) # The 'magic number' 0x1234567B is used to make sure that the |