Update test_crosstab.py

Author: simonjayhawkins

pandas/core/reshape/pivot.py

@@ -329,7 +329,7 @@ def _all_key(key):
                 piece = piece.copy()
                 try:
                     piece[all_key] = margin[key]
-                except (TypeError, ValueError):
+                except ValueError:
                     # we cannot reshape, so coerce the axis
                     piece.set_axis(
                         piece._get_axis(cat_axis)._to_safe_for_reshape(),

pandas/tests/reshape/test_crosstab.py

@@ -746,6 +746,7 @@ def test_margin_normalize_multiple_columns(self):
 
 
 def test_categoricals():
+    # https://github.com/pandas-dev/pandas/issues/37465
     g = np.random.RandomState(25982704)
     a = Series(g.randint(0, 3, size=100)).astype("category")
     b = Series(g.randint(0, 2, size=100)).astype("category")
@@ -755,3 +756,15 @@ def test_categoricals():
     values = [[18, 16, 34], [18, 16, 34], [16, 16, 32], [52, 48, 100]]
     expected = DataFrame(values, index, columns)
     tm.assert_frame_equal(result, expected)
+
+    g = np.random.RandomState(25982704)
+    a = Series(g.randint(0, 3, size=100)).astype("category")
+    a.loc[a == 1] = 2
+    assert a.value_counts().loc[1] == 0
+    b = Series(g.randint(0, 2, size=100)).astype("category")
+    result = crosstab(a, b, margins=True, dropna=False)
+    values = [[18.0, 16.0, 34.0], [0.0, 0.0, np.nan], [34.0, 32.0, 66.0], [52.0, 48.0, 100.0]]
+    expected = DataFrame(values, index, columns)
+    for i in range(2):
+        expected[i] = expected[i].astype("int64")
+    tm.assert_frame_equal(result, expected)