summaryrefslogtreecommitdiff
path: root/Mailman/SecurityManager.py
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/SecurityManager.py')
-rw-r--r--Mailman/SecurityManager.py23
1 files changed, 9 insertions, 14 deletions
diff --git a/Mailman/SecurityManager.py b/Mailman/SecurityManager.py
index ba65fec28..204daf417 100644
--- a/Mailman/SecurityManager.py
+++ b/Mailman/SecurityManager.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2004 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -48,31 +48,26 @@
import os
import re
+import md5
import sha
import time
+import urllib
import Cookie
import marshal
import binascii
-import urllib
+
from types import StringType, TupleType
from urlparse import urlparse
-try:
- import crypt
-except ImportError:
- crypt = None
-import md5
-
-from Mailman import mm_cfg
-from Mailman import Utils
from Mailman import Errors
+from Mailman import Utils
+from Mailman import mm_cfg
from Mailman.Logging.Syslog import syslog
try:
- True, False
-except NameError:
- True = 1
- False = 0
+ import crypt
+except ImportError:
+ crypt = None