Fix unicode handling in str, unicode, and repr

src/richenum/enums.py

@@ -55,16 +55,17 @@ def __init__(self, canonical_name, display_name, *args, **kwargs):
         self.canonical_name = canonical_name
         self.display_name = display_name
 
+    def __repr__(self):
+        return "<%s: %s ('%s')>" % (
+            self.__class__.__name__,
+            self.canonical_name.decode('utf-8', 'replace').encode('ascii', 'replace'),
+            unicode(self.display_name).encode('ascii', 'replace'))
+
     def __unicode__(self):
         return unicode(self.display_name)
 
-    def __repr__(self):
-        return unicode("%s - canonical_name: '%s'  display_name: '%s'" % (self.__class__.__name__,
-                                                                          self.canonical_name,
-                                                                          self.display_name))
-
     def __str__(self):
-        return self.display_name
+        return unicode(self).encode('utf-8', 'xmlcharrefreplace')
 
     def __hash__(self):
         return hash(self.canonical_name)
@@ -107,11 +108,11 @@ def __init__(self, index, canonical_name, display_name, *args, **kwargs):
         self.index = index
 
     def __repr__(self):
-        return unicode("%s - idx: %d  canonical_name: '%s'  display_name: '%s'"
-                       % (self.__class__.__name__,
-                          self.index,
-                          self.canonical_name,
-                          self.display_name))
+        return "<%s #%s: %s ('%s')>" % (
+            self.__class__.__name__,
+            self.index,
+            self.canonical_name.decode('utf-8', 'replace').encode('ascii', 'replace'),
+            unicode(self.display_name).encode('ascii', 'replace'))
 
     def __cmp__(self, other):
         if other is None:

tests/richenum/test_ordered_rich_enums.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import copy
 import unittest2 as unittest
 
@@ -102,3 +103,9 @@ def test_equality_by_index_and_type(self):
         coffee_copy = copy.deepcopy(Breakfast.COFFEE)
         self.assertFalse(coffee_copy is Breakfast.COFFEE)
         self.assertEqual(Breakfast.COFFEE, coffee_copy)
+
+    def test_unicode_handling(self):
+        poop_oatmeal = BreakfastEnumValue(3, 'oatmeal💩', u'Oatmeal💩')
+        self.assertEqual(repr(poop_oatmeal), "<BreakfastEnumValue #3: oatmeal? ('Oatmeal?')>")
+        self.assertEqual(str(poop_oatmeal), "Oatmeal💩")
+        self.assertEqual(unicode(poop_oatmeal), u"Oatmeal💩")

tests/richenum/test_rich_enums.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import copy
 import unittest2 as unittest
 
@@ -125,3 +126,9 @@ def test_equality_by_canonical_name_and_type(self):
         okra_copy = copy.deepcopy(Vegetable.OKRA)
         self.assertFalse(okra_copy is Vegetable.OKRA)
         self.assertEqual(Vegetable.OKRA, okra_copy)
+
+    def test_unicode_handling(self):
+        poop_okra = VegetableEnumValue('gross', 'okra💩', u'Okra💩')
+        self.assertEqual(repr(poop_okra), "<VegetableEnumValue: okra? ('Okra?')>")
+        self.assertEqual(str(poop_okra), "Okra💩")
+        self.assertEqual(unicode(poop_okra), u"Okra💩")