diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-05 08:31:07 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-05 08:31:07 -0400 |
| commit | 01d437d875fe97453df9c8d3a4e674db0f6b9fbc (patch) | |
| tree | 3c40322302a7cb46c14c185b38c88daa21290478 | |
| parent | ce9cbd6577c6ab67d70ea292468fae7f4d3add26 (diff) | |
| parent | d7dec0f7e8cdc12ffc7c8ad42f8b0d4216d8864d (diff) | |
| download | python-setuptools-git-01d437d875fe97453df9c8d3a4e674db0f6b9fbc.tar.gz | |
Merged in goal/distribute (pull request #38)
decode manifest bytes(utf-8) to string first if py version is 3
--HG--
branch : distribute
extra : rebase_source : 785dba80ce819ec9124371c3781a0a607eaa1ff5
| -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. |