Skip to content

Commit 5bf1508

Browse files
Albert Villanova del Moraljreback
Albert Villanova del Moral
authored andcommitted
Address requested changes
1 parent 654288b commit 5bf1508

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

doc/source/whatsnew/v0.20.0.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ Other enhancements
309309
- ``pd.types.concat.union_categoricals`` gained the ``ignore_ordered`` argument to allow ignoring the ordered attribute of unioned categoricals (:issue:`13410`). See the :ref:`categorical union docs <categorical.union>` for more information.
310310
- ``pandas.io.json.json_normalize()`` with an empty ``list`` will return an empty ``DataFrame`` (:issue:`15534`)
311311
- ``pd.DataFrame.to_latex`` and ``pd.DataFrame.to_string`` now allow optional header aliases. (:issue:`15536`)
312-
- ``Index.intersection()`` accepts parameter ``sort`` (:issue:`15582`)
312+
- ``Index.join()`` accepts parameter ``sort`` (:issue:`15582`)
313313

314314
.. _ISO 8601 duration: https://en.wikipedia.org/wiki/ISO_8601#Durations
315315

@@ -774,7 +774,6 @@ joins (methods ``Index.join``, ``DataFrame.join``, ``DataFrame.merge`` and
774774
.. ipython:: python
775775

776776
idx1.intersection(idx2)
777-
778777
idx1.join(idx2, how='inner')
779778

780779
- ``Series.align``
@@ -862,11 +861,7 @@ joins (methods ``Index.join``, ``DataFrame.join``, ``DataFrame.merge`` and
862861
.. ipython:: python
863862

864863
df1.join(df2, how='inner')
865-
866864
df1.merge(df2, how='inner', left_index=True, right_index=True)
867-
868-
pd.merge(df1, df2, how='inner', left_index=True, right_index=True)
869-
870865
(res1, res2) = df1.align(df2, axis=0, join='inner')
871866
res1
872867
res2

pandas/core/frame.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
* right: use only keys from right frame (SQL: right outer join)
129129
* outer: use union of keys from both frames (SQL: full outer join)
130130
* inner: use intersection of keys from both frames (SQL: inner join),
131-
preserving the order of the left keys
131+
preserving the order of the left keys
132132
on : label or list
133133
Field names to join on. Must be found in both DataFrames. If on is
134134
None and not merging on indexes, then it merges on the intersection of
@@ -4465,11 +4465,11 @@ def join(self, other, on=None, how='left', lsuffix='', rsuffix='',
44654465
* left: use calling frame's index (or column if on is specified)
44664466
* right: use other frame's index
44674467
* outer: form union of calling frame's index (or column if on is
4468-
specified) with other frame's index, and sort it
4469-
lexicographically
4468+
specified) with other frame's index, and sort it
4469+
lexicographically
44704470
* inner: form intersection of calling frame's index (or column if
4471-
on is specified) with other frame's index, preserving the
4472-
order of the calling's one
4471+
on is specified) with other frame's index, preserving the order
4472+
of the calling's one
44734473
lsuffix : string
44744474
Suffix to use from left frame's overlapping columns
44754475
rsuffix : string

0 commit comments

Comments
 (0)