Mercurial > hg
changeset 14941:4a28cb4df1f8
windows: check util.mainfrozen() instead of ad-hoc checks everywhere
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Mon, 25 Jul 2011 16:14:02 -0500 |
| parents | b4c06b97dfe0 |
| children | 5b072d4b62f2 |
| files | mercurial/help.py mercurial/hook.py mercurial/templater.py |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help.py Mon Jul 25 22:19:28 2011 +0300 +++ b/mercurial/help.py Mon Jul 25 16:14:02 2011 -0500 @@ -31,7 +31,7 @@ """Return a delayed loader for help/topic.txt.""" def loader(): - if hasattr(sys, 'frozen'): + if util.mainfrozen(): module = sys.executable else: module = __file__
--- a/mercurial/hook.py Mon Jul 25 22:19:28 2011 +0300 +++ b/mercurial/hook.py Mon Jul 25 16:14:02 2011 -0500 @@ -28,7 +28,7 @@ 'a module)') % (hname, funcname)) modname = funcname[:d] oldpaths = sys.path - if hasattr(sys, "frozen"): + if util.mainfrozen(): # binary installs require sys.path manipulation modpath, modfile = os.path.split(modname) if modpath and modfile:
--- a/mercurial/templater.py Mon Jul 25 22:19:28 2011 +0300 +++ b/mercurial/templater.py Mon Jul 25 16:14:02 2011 -0500 @@ -341,7 +341,7 @@ normpaths = [] # executable version (py2exe) doesn't support __file__ - if hasattr(sys, 'frozen'): + if util.mainfrozen(): module = sys.executable else: module = __file__