diff options
| author | Barry Warsaw | 2008-09-28 15:55:09 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2008-09-28 15:55:09 -0400 |
| commit | 39f1395cd1640fd639a2c824611fa1ad9f09a929 (patch) | |
| tree | c3d0492dce4f2e912aea3aa616ce9a2881379197 /mailman/Utils.py | |
| parent | 512145d93efc318adc0250dd53f4a53d8738f679 (diff) | |
| download | mailman-39f1395cd1640fd639a2c824611fa1ad9f09a929.tar.gz mailman-39f1395cd1640fd639a2c824611fa1ad9f09a929.tar.zst mailman-39f1395cd1640fd639a2c824611fa1ad9f09a929.zip | |
Diffstat (limited to 'mailman/Utils.py')
| -rw-r--r-- | mailman/Utils.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mailman/Utils.py b/mailman/Utils.py index 178fff538..c0d2620b3 100644 --- a/mailman/Utils.py +++ b/mailman/Utils.py @@ -37,12 +37,11 @@ import email.Header import email.Iterators from email.Errors import HeaderParseError -from string import ascii_letters, digits, whitespace +from string import ascii_letters, digits, whitespace, Template import mailman.templates from mailman import passwords -from mailman.SafeDict import SafeDict from mailman.configuration import config from mailman.core import errors @@ -525,8 +524,7 @@ def findtext(templatefile, dict=None, raw=False, lang=None, mlist=None): text = template if dict is not None: try: - sdict = SafeDict(dict, lang=lang) - text = sdict.interpolate(template) + text = Template(template).safe_substitute(**dict) except (TypeError, ValueError): # The template is really screwed up log.exception('broken template: %s', filename) |
