diff options
| author | wyj1046 <wyj1046@gmail.com> | 2013-05-05 17:07:31 +0800 |
|---|---|---|
| committer | wyj1046 <wyj1046@gmail.com> | 2013-05-05 17:07:31 +0800 |
| commit | 99bc5bf6bcf5d27971ae3c339d22a43c3512b0d3 (patch) | |
| tree | aa832da999bcea85c0650233d22e44b21ee95ae3 /setuptools/command | |
| parent | 45b7d5f62bf081977603d8b2581e016ebf57ed23 (diff) | |
| download | python-setuptools-bitbucket-99bc5bf6bcf5d27971ae3c339d22a43c3512b0d3.tar.gz | |
decode manifest bytes(utf-8) to string first if py version is 3
Diffstat (limited to 'setuptools/command')
| -rwxr-xr-x | setuptools/command/easy_install.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 7281d92d..dc851d1e 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1867,7 +1867,10 @@ def get_script_args(dist, executable=sys_executable, wininst=False): def load_launcher_manifest(name): manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml') - return manifest % vars() + if sys.version_info[0] < 3: + return manifest % vars() + else: + return manifest.decode('utf-8') % vars() def rmtree(path, ignore_errors=False, onerror=auto_chmod): """Recursively delete a directory tree. |
