This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7443

setup: use bytes for assumed python version
ClosedPublic

Authored by mharbison72 on Nov 16 2019, 12:29 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG6a5dc4d767a0: setup: use bytes for assumed python version
rHG488397449af6: setup: use bytes for assumed python version
Summary

Caught by PyOxidizer when hacking on Windows.

  1. skip-blame for b'' prefixing

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Msetup.py (2 lines)

Diff 18187

setup.py

) )
pythonlib = dllbasename[:-4] pythonlib = dllbasename[:-4]
else: else:
log.warn( log.warn(
'could not determine Python DLL filename; assuming pythonXY' 'could not determine Python DLL filename; assuming pythonXY'
) )
hv = sys.hexversion hv = sys.hexversion
pythonlib = 'python%d%d' % (hv >> 24, (hv >> 16) & 0xFF) pythonlib = b'python%d%d' % (hv >> 24, (hv >> 16) & 0xFF)
log.info('using %s as Python library name' % pythonlib) log.info('using %s as Python library name' % pythonlib)
with open('mercurial/hgpythonlib.h', 'wb') as f: with open('mercurial/hgpythonlib.h', 'wb') as f:
f.write(b'/* this file is autogenerated by setup.py */\n') f.write(b'/* this file is autogenerated by setup.py */\n')
f.write(b'#define HGPYTHONLIB "%s"\n' % pythonlib) f.write(b'#define HGPYTHONLIB "%s"\n' % pythonlib)
macros = None macros = None
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3: