Another step in the removal of the mailman.Utils module. This removes

Utils.maketext() and Utils.findtext() in favor of better implementations in
mailman.utilities.i18n.

We're nearly there!

2 files changed, 9 insertions, 8 deletions

diff --git a/src/mailman/Archiver/Archiver.py b/src/mailman/Archiver/Archiver.py
index f8d1baa46..fe1dec252 100644
--- a/src/mailman/Archiver/Archiver.py
+++ b/src/mailman/Archiver/Archiver.py
@@ -32,9 +32,9 @@ from cStringIO import StringIO
 from string import Template
 from zope.component import getUtility
 
-from mailman import Utils
 from mailman.config import config
 from mailman.interfaces.domain import IDomainManager
+from mailman.utilities.i18n import make
 
 log = logging.getLogger('mailman.error')
 
@@ -111,11 +111,11 @@ class Archiver:
                     fp = open(indexfile, 'w')
                 finally:
                     os.umask(omask)
-                fp.write(Utils.maketext(
-                    'emptyarchive.html',
-                    {'listname': self.real_name,
-                     'listinfo': self.GetScriptURL('listinfo'),
-                     }, mlist=self))
+                fp.write(make('emptyarchive.html',
+                              mailing_list=self,
+                              listname=self.real_name,
+                              listinfo=self.GetScriptURL('listinfo'),
+                              ))
             if fp:
                 fp.close()
         finally:
diff --git a/src/mailman/Archiver/HyperArch.py b/src/mailman/Archiver/HyperArch.py
index 218c46875..92b9de2f0 100644
--- a/src/mailman/Archiver/HyperArch.py
+++ b/src/mailman/Archiver/HyperArch.py
@@ -50,6 +50,7 @@ from mailman.Archiver import pipermail
 from mailman.config import config
 from mailman.core.i18n import _, ctime
 from mailman.interfaces.listmanager import IListManager
+from mailman.utilities.i18n import find
 from mailman.utilities.string import uncanonstr, websafe
 
 
@@ -183,8 +184,8 @@ def quick_maketext(templatefile, dict=None, lang=None, mlist=None):
         template = _templatecache.get(filepath)
     if filepath is None or template is None:
         # Use the basic maketext, with defaults to get the raw template
-        template, filepath = Utils.findtext(templatefile, lang=lang.code,
-                                            raw=True, mlist=mlist)
+        template, filepath = find(templatefile, mailing_list=mlist,
+                                  language=lang.code)
         _templatefilepathcache[cachekey] = filepath
         _templatecache[filepath] = template
     # Copied from Utils.maketext()