This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8469

setup: use sysstr() on process output
ClosedPublic

Authored by indygreg on Apr 21 2020, 10:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG380959c6f75e: setup: use sysstr() on process output
Summary

Otherwise we get a str-bytes mismatch on Python 3 if
an error occurs.

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.

Event Timeline

indygreg created this revision.Apr 21 2020, 10:39 PM
indygreg added a commit: rHG380959c6f75e: setup: use sysstr() on process output.Apr 23 2020, 2:05 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG380959c6f75e: setup: use sysstr() on process output (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (12 lines)

Diff 21200

setup.py

def gentxt(root): def gentxt(root):
txt = 'doc/%s.txt' % root txt = 'doc/%s.txt' % root
log.info('generating %s' % txt) log.info('generating %s' % txt)
res, out, err = runcmd( res, out, err = runcmd(
[sys.executable, 'gendoc.py', root], os.environ, cwd='doc' [sys.executable, 'gendoc.py', root], os.environ, cwd='doc'
) )
if res: if res:
raise SystemExit( raise SystemExit(
'error running gendoc.py: %s' % '\n'.join([out, err]) 'error running gendoc.py: %s'
% '\n'.join([sysstr(out), sysstr(err)])
) )
with open(txt, 'wb') as fh: with open(txt, 'wb') as fh:
fh.write(out) fh.write(out)
def gengendoc(root): def gengendoc(root):
gendoc = 'doc/%s.gendoc.txt' % root gendoc = 'doc/%s.gendoc.txt' % root
log.info('generating %s' % gendoc) log.info('generating %s' % gendoc)
res, out, err = runcmd( res, out, err = runcmd(
[sys.executable, 'gendoc.py', '%s.gendoc' % root], [sys.executable, 'gendoc.py', '%s.gendoc' % root],
os.environ, os.environ,
cwd='doc', cwd='doc',
) )
if res: if res:
raise SystemExit( raise SystemExit(
'error running gendoc: %s' % '\n'.join([out, err]) 'error running gendoc: %s'
% '\n'.join([sysstr(out), sysstr(err)])
) )
with open(gendoc, 'wb') as fh: with open(gendoc, 'wb') as fh:
fh.write(out) fh.write(out)
def genman(root): def genman(root):
log.info('generating doc/%s' % root) log.info('generating doc/%s' % root)
res, out, err = runcmd( res, out, err = runcmd(
[ [
sys.executable, sys.executable,
'runrst', 'runrst',
'hgmanpage', 'hgmanpage',
'--halt', '--halt',
'warning', 'warning',
'--strip-elements-with-class', '--strip-elements-with-class',
'htmlonly', 'htmlonly',
'%s.txt' % root, '%s.txt' % root,
root, root,
], ],
os.environ, os.environ,
cwd='doc', cwd='doc',
) )
if res: if res:
raise SystemExit( raise SystemExit(
'error running runrst: %s' % '\n'.join([out, err]) 'error running runrst: %s'
% '\n'.join([sysstr(out), sysstr(err)])
) )
normalizecrlf('doc/%s' % root) normalizecrlf('doc/%s' % root)
def genhtml(root): def genhtml(root):
log.info('generating doc/%s.html' % root) log.info('generating doc/%s.html' % root)
res, out, err = runcmd( res, out, err = runcmd(
[ [
sys.executable, sys.executable,
'runrst', 'runrst',
'html', 'html',
'--halt', '--halt',
'warning', 'warning',
'--link-stylesheet', '--link-stylesheet',
'--stylesheet-path', '--stylesheet-path',
'style.css', 'style.css',
'%s.txt' % root, '%s.txt' % root,
'%s.html' % root, '%s.html' % root,
], ],
os.environ, os.environ,
cwd='doc', cwd='doc',
) )
if res: if res:
raise SystemExit( raise SystemExit(
'error running runrst: %s' % '\n'.join([out, err]) 'error running runrst: %s'
% '\n'.join([sysstr(out), sysstr(err)])
) )
normalizecrlf('doc/%s.html' % root) normalizecrlf('doc/%s.html' % root)
# This logic is duplicated in doc/Makefile. # This logic is duplicated in doc/Makefile.
sources = { sources = {
f f
for f in os.listdir('mercurial/helptext') for f in os.listdir('mercurial/helptext')