summaryrefslogtreecommitdiff
path: root/src/mailman/Utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/Utils.py')
-rw-r--r--src/mailman/Utils.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mailman/Utils.py b/src/mailman/Utils.py
index 44058573f..c07888fc5 100644
--- a/src/mailman/Utils.py
+++ b/src/mailman/Utils.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -32,12 +32,10 @@ __all__ = [
import os
import re
import cgi
-import time
import errno
import base64
import random
import logging
-import htmlentitydefs
# pylint: disable-msg=E0611,W0403
from email.errors import HeaderParseError
@@ -50,7 +48,6 @@ import mailman.templates
from mailman import passwords
from mailman.config import config
-from mailman.core import errors
from mailman.core.i18n import _
from mailman.interfaces.languages import ILanguageManager
from mailman.utilities.string import expand
@@ -441,7 +438,7 @@ def uncanonstr(s, lang=None):
if isinstance(s, unicode):
return s.encode(charset)
else:
- u = unicode(s, charset)
+ unicode(s, charset)
return s
except UnicodeError:
# Nope, it contains funny characters, so html-ref it