@@ -2319,9 +2319,9 @@ def union(self, other, sort=True):
2319
2319
try :
2320
2320
result = sorting .safe_sort (result )
2321
2321
except TypeError as e :
2322
- warnings .warn ("%s , sort order is undefined for "
2323
- "incomparable objects" % e , RuntimeWarning ,
2324
- stacklevel = 3 )
2322
+ warnings .warn ("{} , sort order is undefined for "
2323
+ "incomparable objects" . format ( e ) ,
2324
+ RuntimeWarning , stacklevel = 3 )
2325
2325
2326
2326
# for subclasses
2327
2327
return self ._wrap_setop_result (other , result )
@@ -2395,17 +2395,12 @@ def intersection(self, other, sort=True):
2395
2395
taken = other .take (indexer )
2396
2396
2397
2397
if sort :
2398
- try :
2399
- taken = sorting .safe_sort (taken .values )
2400
- if self .name != other .name :
2401
- name = None
2402
- else :
2403
- name = self .name
2404
- return self ._shallow_copy (taken , name = name )
2405
- except TypeError as e :
2406
- warnings .warn ("%s, sort order is undefined for "
2407
- "incomparable objects" % e , RuntimeWarning ,
2408
- stacklevel = 3 )
2398
+ taken = sorting .safe_sort (taken .values )
2399
+ if self .name != other .name :
2400
+ name = None
2401
+ else :
2402
+ name = self .name
2403
+ return self ._shallow_copy (taken , name = name )
2409
2404
2410
2405
if self .name != other .name :
2411
2406
taken .name = None
@@ -3252,8 +3247,12 @@ def join(self, other, how='left', level=None, return_indexers=False,
3252
3247
elif how == 'right' :
3253
3248
join_index = other
3254
3249
elif how == 'inner' :
3250
+ # TODO: sort=False here for backwards compat. It may
3251
+ # be better to use the sort parameter passed into join
3255
3252
join_index = self .intersection (other , sort = False )
3256
3253
elif how == 'outer' :
3254
+ # TODO: sort=True here for backwards compat. It may
3255
+ # be better to use the sort parameter passed into join
3257
3256
join_index = self .union (other )
3258
3257
3259
3258
if sort :
0 commit comments