1. Tarek Ziadé
  2. distribute

Commits

Jason R. Coombs  committed 785dba8 Merge

Merged in goal/distribute (pull request #38)

decode manifest bytes(utf-8) to string first if py version is 3

  • Participants
  • Parent commits 3d0a26c, 1038acd
  • Branches default

Comments (0)

Files changed (1)

File setuptools/command/easy_install.py

View file
 
 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.