This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2434

util: use pycompat.bytestr() instead of str()
ClosedPublic

Authored by durin42 on Feb 25 2018, 10:48 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd26b0bedfaa4: util: use pycompat.bytestr() instead of str()
Summary

This fixes at least some environment variable prints for util.system()
callers on Python 3. Yay!

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

durin42 created this revision.Feb 25 2018, 10:48 PM
durin42 updated this revision to Diff 6085.Feb 26 2018, 12:16 AM
indygreg accepted this revision.Feb 26 2018, 12:34 AM
This revision is now accepted and ready to land.Feb 26 2018, 12:34 AM
Closed by commit rHGd26b0bedfaa4: util: use pycompat.bytestr() instead of str() (authored by durin42). · Explain WhyFeb 26 2018, 12:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (2 lines)

Diff 6092

mercurial/util.py

def shellenviron(environ=None): def shellenviron(environ=None):
"""return environ with optional override, useful for shelling out""" """return environ with optional override, useful for shelling out"""
def py2shell(val): def py2shell(val):
'convert python object into string that is useful to shell' 'convert python object into string that is useful to shell'
if val is None or val is False: if val is None or val is False:
return '0' return '0'
if val is True: if val is True:
return '1' return '1'
return str(val) return pycompat.bytestr(val)
env = dict(encoding.environ) env = dict(encoding.environ)
if environ: if environ:
env.update((k, py2shell(v)) for k, v in environ.iteritems()) env.update((k, py2shell(v)) for k, v in environ.iteritems())
env['HG'] = hgexecutable() env['HG'] = hgexecutable()
return env return env
def system(cmd, environ=None, cwd=None, out=None): def system(cmd, environ=None, cwd=None, out=None):
'''enhanced shell command execution. '''enhanced shell command execution.