Mercurial > public > mercurial-scm > hg
comparison mercurial/util.py @ 43657: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 | 0b7733719d21 |
children | 664e24207728 |
comparison
equal
deleted
inserted
replaced
43656:47d983f0af65 | 43657:38387f9e4d22 |
---|---|
1821 b.reverse() | 1821 b.reverse() |
1822 return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' | 1822 return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' |
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: |
1830 datapath = os.path.dirname(pycompat.fsencode(__file__)) | 1830 datapath = os.path.dirname(pycompat.fsencode(__file__)) |
1831 | 1831 |