Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use native string for 'macosx_app'
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 14 Nov 2019 14:14:11 -0800
changeset 43657 38387f9e4d22
parent 43656 47d983f0af65
child 43658 0796e266d26b
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
mercurial/util.py file | annotate | diff | comparison | revisions
mercurial/utils/procutil.py file | annotate | diff | comparison | revisions 
--- 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:
Mercurial