# HG changeset patch # User Benoit Boissinot # Date 1142403004 -3600 # Node ID 295010327271f7925e46505379110544bb7f2dd2 # Parent 16750010813d23a67daa41d408a3518ccdcbb46d# Parent 2f500a4b6e994419e3de6966ab2d37003167f167 merge with crew diff -r 16750010813d -r 295010327271 mercurial/templater.py --- a/mercurial/templater.py Wed Mar 15 07:09:42 2006 +0100 +++ b/mercurial/templater.py Wed Mar 15 07:10:04 2006 +0100 @@ -8,7 +8,7 @@ import re from demandload import demandload from i18n import gettext as _ -demandload(globals(), "cStringIO cgi os time urllib util") +demandload(globals(), "cStringIO cgi sys os time urllib util") esctable = { '\\': '\\', @@ -235,3 +235,7 @@ p = os.path.join(os.path.dirname(__file__), *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")