15 files changed, 16 insertions, 16 deletions

diff --git a/setup.py b/setup.py
index ed7d23d18..804a2f4ed 100644
--- a/setup.py
+++ b/setup.py
@@ -95,12 +95,12 @@ case second `m'.  Any other spelling is incorrect.""",
         },
     install_requires = [
         'argparse',
+        'flufl.enum',
         'flufl.i18n',
         'httplib2',
         'lazr.config',
         'lazr.smtptest',
         'locknix',
-        'munepy',
         'restish',
         'storm',
         'zc.buildout',
diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py
index 6ccc5b7bc..96b265864 100644
--- a/src/mailman/bin/master.py
+++ b/src/mailman/bin/master.py
@@ -34,9 +34,9 @@ import socket
 import logging
 
 from datetime import datetime, timedelta
+from flufl.enum import Enum
 from lazr.config import as_boolean
 from locknix import lockfile
-from munepy import Enum
 
 from mailman.config import config
 from mailman.core.i18n import _
diff --git a/src/mailman/database/types.py b/src/mailman/database/types.py
index 6d159eb52..a4e76a7e8 100644
--- a/src/mailman/database/types.py
+++ b/src/mailman/database/types.py
@@ -59,6 +59,6 @@ class _EnumVariable(Variable):
 
 
 class Enum(SimpleProperty):
-    """Custom munepy.Enum type for Storm."""
+    """Custom Enum type for Storm."""
 
     variable_class = _EnumVariable
diff --git a/src/mailman/interfaces/action.py b/src/mailman/interfaces/action.py
index a87023b3d..0e4ba7d35 100644
--- a/src/mailman/interfaces/action.py
+++ b/src/mailman/interfaces/action.py
@@ -21,7 +21,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 
 
 
diff --git a/src/mailman/interfaces/autorespond.py b/src/mailman/interfaces/autorespond.py
index cc32f66b2..6f5487842 100644
--- a/src/mailman/interfaces/autorespond.py
+++ b/src/mailman/interfaces/autorespond.py
@@ -30,7 +30,7 @@ __all__ = [
 
 
 from datetime import timedelta
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 ALWAYS_REPLY = timedelta()
diff --git a/src/mailman/interfaces/chain.py b/src/mailman/interfaces/chain.py
index d08132a59..da91fd982 100644
--- a/src/mailman/interfaces/chain.py
+++ b/src/mailman/interfaces/chain.py
@@ -29,7 +29,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 
diff --git a/src/mailman/interfaces/command.py b/src/mailman/interfaces/command.py
index 9dd640a3f..08012b863 100644
--- a/src/mailman/interfaces/command.py
+++ b/src/mailman/interfaces/command.py
@@ -28,7 +28,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 
diff --git a/src/mailman/interfaces/digests.py b/src/mailman/interfaces/digests.py
index 9c224d4b5..488e01bba 100644
--- a/src/mailman/interfaces/digests.py
+++ b/src/mailman/interfaces/digests.py
@@ -25,7 +25,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 
diff --git a/src/mailman/interfaces/mailinglist.py b/src/mailman/interfaces/mailinglist.py
index 6367a7d1d..d5317828f 100644
--- a/src/mailman/interfaces/mailinglist.py
+++ b/src/mailman/interfaces/mailinglist.py
@@ -30,7 +30,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 from mailman.core.i18n import _
diff --git a/src/mailman/interfaces/member.py b/src/mailman/interfaces/member.py
index df5ccc935..8e316785b 100644
--- a/src/mailman/interfaces/member.py
+++ b/src/mailman/interfaces/member.py
@@ -32,7 +32,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 from mailman.core.errors import MailmanError
diff --git a/src/mailman/interfaces/mime.py b/src/mailman/interfaces/mime.py
index 73ba0c788..e1928bc5c 100644
--- a/src/mailman/interfaces/mime.py
+++ b/src/mailman/interfaces/mime.py
@@ -27,7 +27,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 
diff --git a/src/mailman/interfaces/nntp.py b/src/mailman/interfaces/nntp.py
index a266246b0..6eb02ef68 100644
--- a/src/mailman/interfaces/nntp.py
+++ b/src/mailman/interfaces/nntp.py
@@ -21,7 +21,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 
 
 
diff --git a/src/mailman/interfaces/requests.py b/src/mailman/interfaces/requests.py
index 14d191804..779102f9a 100644
--- a/src/mailman/interfaces/requests.py
+++ b/src/mailman/interfaces/requests.py
@@ -31,7 +31,7 @@ __all__ = [
     ]
 
 
-from munepy import Enum
+from flufl.enum import Enum
 from zope.interface import Interface, Attribute
 
 
diff --git a/src/mailman/passwords.py b/src/mailman/passwords.py
index 312c80e7d..b7563f374 100644
--- a/src/mailman/passwords.py
+++ b/src/mailman/passwords.py
@@ -38,7 +38,7 @@ import hashlib
 from array import array
 from base64 import urlsafe_b64decode as decode
 from base64 import urlsafe_b64encode as encode
-from munepy import Enum
+from flufl.enum import Enum
 
 from mailman.core import errors
 
diff --git a/src/mailman/testing/i18n.py b/src/mailman/testing/i18n.py
index 3edefc519..1f97d8df3 100644
--- a/src/mailman/testing/i18n.py
+++ b/src/mailman/testing/i18n.py
@@ -40,8 +40,8 @@ class TestingStrategy:
     def __init__(self, name):
         self.name = name
 
-    def __call__(self, language_code):
-        if language_code == 'en':
+    def __call__(self, language_code=None):
+        if language_code in ('en', None):
             return NullTranslations()
         mo_file = 'mailman-%s.mo' % language_code
         with closing(resource_stream('mailman.testing', mo_file)) as fp: