Commit 01d437d8 authored by Jason R. Coombs's avatar Jason R. Coombs

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
parents ce9cbd65 d7dec0f7
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment