--- a/mercurial/templater.py Thu Nov 14 12:41:33 2019 -0800
+++ b/mercurial/templater.py Thu Nov 14 13:18:22 2019 -0800
@@ -80,7 +80,10 @@
templateutil,
util,
)
-from .utils import stringutil
+from .utils import (
+ resourceutil,
+ stringutil,
+)
# template parsing
@@ -1042,7 +1045,10 @@
def templatepaths():
'''return locations used for template files.'''
pathsrel = [b'templates']
- paths = [os.path.normpath(os.path.join(util.datapath, f)) for f in pathsrel]
+ paths = [
+ os.path.normpath(os.path.join(resourceutil.datapath, f))
+ for f in pathsrel
+ ]
return [p for p in paths if os.path.isdir(p)]