##// END OF EJS Templates
py3: use native string for 'macosx_app'...
Martin von Zweigbergk -
r44056:38387f9e default
parent child Browse files
Show More
@@ -1823,7 +1823,7 b' def pathto(root, n1, n2):'
1823
1823
1824
1824
1825 # the location of data files matching the source code
1825 # the location of data files matching the source code
1826 if procutil.mainfrozen() and getattr(sys, 'frozen', None) != b'macosx_app':
1826 if procutil.mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
1827 # executable version (py2exe) doesn't support __file__
1827 # executable version (py2exe) doesn't support __file__
1828 datapath = os.path.dirname(pycompat.sysexecutable)
1828 datapath = os.path.dirname(pycompat.sysexecutable)
1829 else:
1829 else:
@@ -281,7 +281,7 b' def hgexecutable():'
281 if hg:
281 if hg:
282 _sethgexecutable(hg)
282 _sethgexecutable(hg)
283 elif mainfrozen():
283 elif mainfrozen():
284 if getattr(sys, 'frozen', None) == b'macosx_app':
284 if getattr(sys, 'frozen', None) == 'macosx_app':
285 # Env variable set by py2app
285 # Env variable set by py2app
286 _sethgexecutable(encoding.environ[b'EXECUTABLEPATH'])
286 _sethgexecutable(encoding.environ[b'EXECUTABLEPATH'])
287 else:
287 else:
@@ -457,7 +457,7 b' def hgcmd():'
457 get either the python call or current executable.
457 get either the python call or current executable.
458 """
458 """
459 if mainfrozen():
459 if mainfrozen():
460 if getattr(sys, 'frozen', None) == b'macosx_app':
460 if getattr(sys, 'frozen', None) == 'macosx_app':
461 # Env variable set by py2app
461 # Env variable set by py2app
462 return [encoding.environ[b'EXECUTABLEPATH']]
462 return [encoding.environ[b'EXECUTABLEPATH']]
463 else:
463 else:
General Comments 0
You need to be logged in to leave comments. Login now