Fix writing git commit ID to a file on build with Python 3.

takluyver · minrk · commit 78203e07891a · 2012-04-16T19:01:12.000-07:00
diff --git a/setupbase.py b/setupbase.py
@@ -20,7 +20,6 @@
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
-import io
 import os
 import sys
 
@@ -55,11 +54,6 @@ def execfile(fname, globs, locs=None):
         locs = locs or globs
         exec(compile(open(fname).read(), fname, "exec"), globs, locs)
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
 # A little utility we'll need below, since glob() does NOT allow you to do
 # exclusion on multiple endings!
 def file_doesnt_endwith(test,endings):
@@ -358,9 +352,9 @@ def run(self):
             repo_commit = repo_commit.strip()
             # We write the installation commit even if it's empty
             out_pth = pjoin(self.build_lib, pkg_dir, 'utils', '_sysinfo.py')
-            with io.open(out_pth, 'w') as out_file:
-                out_file.writelines(map(unicode, [
+            with open(out_pth, 'w') as out_file:
+                out_file.writelines([
                     '# GENERATED BY setup.py\n',
-                    'commit = "%s"\n' % repo_commit,
-                ]))
+                    'commit = "%s"\n' % repo_commit.decode('ascii'),
+                ])
     return MyBuildPy
