Mercurial > hg-stable
changeset 43701:38387f9e4d22
py3: use native string for 'macosx_app'
I couldn't find any definitive information on this, but all examples
(except for ours) seem to use a native string.
Differential Revision: https://phab.mercurial-scm.org/D7414
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 14 Nov 2019 14:14:11 -0800 |
| parents | 47d983f0af65 |
| children | 0796e266d26b |
| files | mercurial/util.py mercurial/utils/procutil.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py Thu Nov 14 14:07:36 2019 -0800 +++ b/mercurial/util.py Thu Nov 14 14:14:11 2019 -0800 @@ -1823,7 +1823,7 @@ # the location of data files matching the source code -if procutil.mainfrozen() and getattr(sys, 'frozen', None) != b'macosx_app': +if procutil.mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app': # executable version (py2exe) doesn't support __file__ datapath = os.path.dirname(pycompat.sysexecutable) else:
--- a/mercurial/utils/procutil.py Thu Nov 14 14:07:36 2019 -0800 +++ b/mercurial/utils/procutil.py Thu Nov 14 14:14:11 2019 -0800 @@ -281,7 +281,7 @@ if hg: _sethgexecutable(hg) elif mainfrozen(): - if getattr(sys, 'frozen', None) == b'macosx_app': + if getattr(sys, 'frozen', None) == 'macosx_app': # Env variable set by py2app _sethgexecutable(encoding.environ[b'EXECUTABLEPATH']) else: @@ -457,7 +457,7 @@ get either the python call or current executable. """ if mainfrozen(): - if getattr(sys, 'frozen', None) == b'macosx_app': + if getattr(sys, 'frozen', None) == 'macosx_app': # Env variable set by py2app return [encoding.environ[b'EXECUTABLEPATH']] else: