This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7412

py3: use native string as fallback value for __file__ for consistency
ClosedPublic

Authored by martinvonz on Nov 14 2019, 5:17 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGef43765c921d: py3: use native string as fallback value for __file__ for consistency
Summary

This is not a bugfix (pycommpat.fsencode(b'') is a no-op on py3), but
the b'' value was inconsistent and confusing.

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
Mmercurial/utils/procutil.py (2 lines)

Diff 18135

mercurial/utils/procutil.py

if getattr(sys, 'frozen', None) == b'macosx_app': if getattr(sys, 'frozen', None) == b'macosx_app':
# Env variable set by py2app # Env variable set by py2app
_sethgexecutable(encoding.environ[b'EXECUTABLEPATH']) _sethgexecutable(encoding.environ[b'EXECUTABLEPATH'])
else: else:
_sethgexecutable(pycompat.sysexecutable) _sethgexecutable(pycompat.sysexecutable)
elif ( elif (
not pycompat.iswindows not pycompat.iswindows
and os.path.basename( and os.path.basename(
pycompat.fsencode(getattr(mainmod, '__file__', b'')) pycompat.fsencode(getattr(mainmod, '__file__', ''))
) )
== b'hg' == b'hg'
): ):
_sethgexecutable(pycompat.fsencode(mainmod.__file__)) _sethgexecutable(pycompat.fsencode(mainmod.__file__))
else: else:
_sethgexecutable( _sethgexecutable(
findexe(b'hg') or os.path.basename(pycompat.sysargv[0]) findexe(b'hg') or os.path.basename(pycompat.sysargv[0])
) )