| @@ -916,11 +916,13 @@ def _maybe_coerce_merge_keys(self): |
|
|
| 916 |
916 |
# Houston, we have a problem! |
| 917 |
917 |
# let's coerce to object |
| 918 |
918 |
if name in self.left.columns: |
| 919 |
|
-typ = lk.categories.dtype if is_categorical_dtype(lk) else object |
|
919 |
+cat = is_categorical_dtype(lk) |
|
920 |
+typ = lk.categories.dtype if cat else object |
| 920 |
921 |
self.left = self.left.assign( |
| 921 |
922 |
**{name: self.left[name].astype(typ)}) |
| 922 |
923 |
if name in self.right.columns: |
| 923 |
|
-typ = rk.categories.dtype if is_categorical_dtype(rk) else object |
|
924 |
+cat = is_categorical_dtype(rk) |
|
925 |
+typ = rk.categories.dtype if cat else object |
| 924 |
926 |
self.right = self.right.assign( |
| 925 |
927 |
**{name: self.right[name].astype(typ)}) |
| 926 |
928 |
|