Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templater.py @ 2001:a439b7b51530
Windows py2exe version didn't handle names given to templatepath() correctly
author | Lee Cantey <lcantey@gmail.com> |
---|---|
date | Fri, 24 Mar 2006 10:33:18 -0800 |
parents | 04c17fc39c84 |
children | e3eba577a0ae |
line wrap: on
line diff
--- a/mercurial/templater.py Fri Mar 24 10:31:23 2006 -0800 +++ b/mercurial/templater.py Fri Mar 24 10:33:18 2006 -0800 @@ -292,13 +292,14 @@ def templatepath(name=None): '''return location of template file or directory (if no name). returns None if not found.''' + # executable version (py2exe) doesn't support __file__ + if hasattr(sys, 'frozen'): + module = sys.executable + else: + module = __file__ for f in 'templates', '../templates': fl = f.split('/') if name: fl.append(name) - p = os.path.join(os.path.dirname(__file__), *fl) + p = os.path.join(os.path.dirname(module), *fl) if (name and os.path.exists(p)) or os.path.isdir(p): return os.path.normpath(p) - else: - # executable version (py2exe) doesn't support __file__ - if hasattr(sys, 'frozen'): - return os.path.join(sys.prefix, "templates")