2 files changed, 9 insertions, 2 deletions

diff --git a/Mailman/enum.py b/Mailman/enum.py
index a42799f37..893e988ba 100644
--- a/Mailman/enum.py
+++ b/Mailman/enum.py
@@ -76,7 +76,7 @@ class EnumMetaclass(type):
 
     def __iter__(cls):
         for i in sorted(cls._enums):
-            yield cls._enums[i]
+            yield getattr(cls, cls._enums[i])
 
     def __getitem__(cls, i):
         # i can be an integer or a string
diff --git a/Mailman/testing/test_enum.py b/Mailman/testing/test_enum.py
index 6f198df67..de6877afc 100644
--- a/Mailman/testing/test_enum.py
+++ b/Mailman/testing/test_enum.py
@@ -94,7 +94,6 @@ class TestEnum(unittest.TestCase):
         eq(int(MoreColors.red), 1)
         eq(int(OtherColors.blue), 2)
         
-
     def test_enum_duplicates(self):
         try:
             class Bad(Enum):
@@ -109,6 +108,14 @@ class TestEnum(unittest.TestCase):
             got_error = False
         self.failUnless(got_error)
 
+    def test_enum_iteration(self):
+        eq = self.assertEqual
+        # Iteration sorts on the int value of the enum
+        values = [str(v) for v in MoreColors]
+        eq(values, ['red', 'green', 'blue', 'pink', 'cyan'])
+        values = [int(v) for v in MoreColors]
+        eq(values, [1, 2, 3, 4, 5])
+
 
 
 def test_suite():