diff --git a/IPython/utils/_sysinfo.py b/IPython/utils/_sysinfo.py index 2e58242..a80b029 100644 --- a/IPython/utils/_sysinfo.py +++ b/IPython/utils/_sysinfo.py @@ -1,2 +1,2 @@ # GENERATED BY setup.py -commit = "" +commit = u"" diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py index e3d40c0..bc89cb6 100644 --- a/IPython/utils/sysinfo.py +++ b/IPython/utils/sysinfo.py @@ -61,8 +61,8 @@ def pkg_commit_hash(pkg_path): cwd=pkg_path, shell=True) repo_commit, _ = proc.communicate() if repo_commit: - return 'repository', repo_commit.strip() - return '(none found)', '<not found>' + return 'repository', repo_commit.strip().decode('ascii') + return '(none found)', u'<not found>' def pkg_info(pkg_path): diff --git a/setupbase.py b/setupbase.py index f2f20d1..d0495be 100644 --- a/setupbase.py +++ b/setupbase.py @@ -579,7 +579,7 @@ def git_prebuild(pkg_dir, build_cmd=build_py): with open(out_pth, 'w') as out_file: out_file.writelines([ '# GENERATED BY setup.py\n', - 'commit = "%s"\n' % repo_commit, + 'commit = u"%s"\n' % repo_commit, ]) return require_submodules(MyBuildPy)