Fixup repr, equality tests

Author: TomAugspurger

pandas/core/dtypes/dtypes.py

@@ -216,7 +216,7 @@ def __eq__(self, other):
     def __unicode__(self):
         tpl = 'CategoricalDtype({}ordered={})'
         if self.categories is None:
-            data = "None"
+            data = "None, "
         else:
             data = self.categories._format_data(name=self.__class__.__name__)
         return tpl.format(data, self.ordered)

pandas/tests/dtypes/test_dtypes.py

@@ -601,14 +601,14 @@ def test_same_categories_different_order(self):
     @pytest.mark.parametrize('ordered, other, expected', [
         (True, CategoricalDtype(['a', 'b'], True), True),
         (False, CategoricalDtype(['a', 'b'], False), True),
-        (True, CategoricalDtype(['a', 'b'], False), True),
-        # (False, CategoricalDtype(['a', 'b'], True), False),
-        # (True, CategoricalDtype([1, 2], False), False),
-        # (False, CategoricalDtype([1, 2], True), False),
-        # (False, CategoricalDtype(None, True), False),
-        # (True, CategoricalDtype(None, True), False),
-        # (False, CategoricalDtype(None, False), False),
-        # (True, CategoricalDtype(None, False), False),
+        (True, CategoricalDtype(['a', 'b'], False), False),
+        (False, CategoricalDtype(['a', 'b'], True), False),
+        (True, CategoricalDtype([1, 2], False), False),
+        (False, CategoricalDtype([1, 2], True), False),
+        (False, CategoricalDtype(None, True), True),
+        (True, CategoricalDtype(None, True), True),
+        (False, CategoricalDtype(None, False), True),
+        (True, CategoricalDtype(None, False), True),
         (True, 'category', True),
         (False, 'category', True),
         (True, 'not a category', False),