D7414: py3: use native string for 'macosx_app'
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Nov 14 22:17:54 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
I couldn't find any definitive information on this, but all examples
(except for ours) seem to use a native string.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D7414
AFFECTED FILES
mercurial/util.py
mercurial/utils/procutil.py
CHANGE DETAILS
diff --git a/mercurial/utils/procutil.py b/mercurial/utils/procutil.py
--- a/mercurial/utils/procutil.py
+++ b/mercurial/utils/procutil.py
@@ -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:
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -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:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list