diff options
author | wyj1046@gmail.com <wyj1046@gmail.com> | 2013-05-05 17:07:31 +0800 |
---|---|---|
committer | wyj1046@gmail.com <wyj1046@gmail.com> | 2013-05-05 17:07:31 +0800 |
commit | d7dec0f7e8cdc12ffc7c8ad42f8b0d4216d8864d (patch) | |
tree | 8d829ae787e96ac9bb3fca300ba0ad1738d9f2f9 | |
parent | 2277d1b0cba871f12f62949bd744227cab04b9a7 (diff) | |
download | external_python_setuptools-d7dec0f7e8cdc12ffc7c8ad42f8b0d4216d8864d.tar.gz external_python_setuptools-d7dec0f7e8cdc12ffc7c8ad42f8b0d4216d8864d.tar.bz2 external_python_setuptools-d7dec0f7e8cdc12ffc7c8ad42f8b0d4216d8864d.zip |
decode manifest bytes(utf-8) to string first if py version is 3
--HG--
branch : distribute
extra : rebase_source : 1038acda4912af8ac637d0e149630a95f3536dec
-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. |