Merge pull request #40 from sergei-maertens/develop

Fixed #33: access dict methods of Labels (IPython support)

djchoices/choices.py

@@ -11,7 +11,8 @@
 # Support Functionality (Not part of public API)
 
 class Labels(dict):
-    def __getattribute__(self, name):
+
+    def __getattr__(self, name):
         result = dict.get(self, name, None)
         if result is not None:
             return result

djchoices/tests/test_private_api.py

@@ -0,0 +1,26 @@
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
+from djchoices import DjangoChoices, C, ChoiceItem
+
+
+class PrivateAPITests(unittest.TestCase):
+
+    def test_labels_dict(self):
+        """
+        Ref #33: IPython reads the Labels.keys() for pretty printing.
+        """
+        class Choices(DjangoChoices):
+            a = ChoiceItem('a', 'A')
+            b = ChoiceItem('b', 'B')
+
+        self.assertEqual(Choices.labels.a, 'A')
+        self.assertEqual(Choices.labels.b, 'B')
+        with self.assertRaises(AttributeError):
+            Choices.labels.c
+
+        keys = Choices.labels.keys()
+        self.assertEqual(set(keys), set(['a', 'b']))
+