mailman.Errors -> mailman.core.errors

3 files changed, 6 insertions, 7 deletions

diff --git a/mailman/tests/test_membership.py b/mailman/tests/test_membership.py
index dca7e020b..062520665 100644
--- a/mailman/tests/test_membership.py
+++ b/mailman/tests/test_membership.py
@@ -23,9 +23,9 @@ import unittest
 
 from mailman import Utils
 from mailman import passwords
-from mailman.Errors import NotAMemberError
 from mailman.UserDesc import UserDesc
 from mailman.configuration import config
+from mailman.core.errors import NotAMemberError
 
 
 
diff --git a/mailman/tests/test_passwords.py b/mailman/tests/test_passwords.py
index 3c539c77b..7c9b9671e 100644
--- a/mailman/tests/test_passwords.py
+++ b/mailman/tests/test_passwords.py
@@ -19,8 +19,8 @@
 
 import unittest
 
-from mailman import Errors
 from mailman import passwords
+from mailman.core import errors
 
 
 
@@ -73,19 +73,19 @@ class TestBogusPasswords(TestPasswordsBase):
     scheme = -1
 
     def test_passwords(self):
-        self.assertRaises(Errors.BadPasswordSchemeError,
+        self.assertRaises(errors.BadPasswordSchemeError,
                           passwords.make_secret, self.pw8a, self.scheme)
 
     def test_unicode_passwords(self):
-        self.assertRaises(Errors.BadPasswordSchemeError,
+        self.assertRaises(errors.BadPasswordSchemeError,
                           passwords.make_secret, self.pwua, self.scheme)
 
     def test_passwords_with_funky_chars(self):
-        self.assertRaises(Errors.BadPasswordSchemeError,
+        self.assertRaises(errors.BadPasswordSchemeError,
                           passwords.make_secret, self.pw8b, self.scheme)
 
     def test_unicode_passwords_with_funky_chars(self):
-        self.assertRaises(Errors.BadPasswordSchemeError,
+        self.assertRaises(errors.BadPasswordSchemeError,
                           passwords.make_secret, self.pwub, self.scheme)
 
 
diff --git a/mailman/tests/test_security_mgr.py b/mailman/tests/test_security_mgr.py
index 2b5cd20c3..3dde9dd2a 100644
--- a/mailman/tests/test_security_mgr.py
+++ b/mailman/tests/test_security_mgr.py
@@ -27,7 +27,6 @@ import unittest
 # Don't use cStringIO because we're going to inherit
 from StringIO import StringIO
 
-from mailman import Errors
 from mailman import Utils
 from mailman import passwords
 from mailman.configuration import config