Skip to content

Commit b82d117

Browse files
committed
Lint fixes
1 parent a81933d commit b82d117

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

pandas/core/reshape/merge.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -916,11 +916,13 @@ def _maybe_coerce_merge_keys(self):
916916
# Houston, we have a problem!
917917
# let's coerce to object
918918
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
920921
self.left = self.left.assign(
921922
**{name: self.left[name].astype(typ)})
922923
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
924926
self.right = self.right.assign(
925927
**{name: self.right[name].astype(typ)})
926928

0 commit comments

Comments
 (0)