Skip to content

Commit 0de0e84

Browse files
committed
remove deprecation of iteritems
1 parent 5790132 commit 0de0e84

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

doc/source/reference/frame.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ Indexing, iteration
6767
DataFrame.insert
6868
DataFrame.__iter__
6969
DataFrame.items
70+
DataFrame.iteritems
7071
DataFrame.keys
71-
DataFrame.items
7272
DataFrame.iterrows
7373
DataFrame.itertuples
7474
DataFrame.lookup

doc/source/reference/series.rst

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Indexing, iteration
7777
Series.iloc
7878
Series.__iter__
7979
Series.items
80+
Series.iteritems
8081
Series.keys
8182
Series.pop
8283
Series.item

doc/source/whatsnew/v0.25.0.rst

-1
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,6 @@ Other deprecations
886886
- :meth:`Index.item` and :meth:`Series.item` is deprecated. (:issue:`18262`)
887887
- The default value ``ordered=None`` in :class:`~pandas.api.types.CategoricalDtype` has been deprecated in favor of ``ordered=False``. When converting between categorical types ``ordered=True`` must be explicitly passed in order to be preserved. (:issue:`26336`)
888888
- :meth:`Index.contains` is deprecated. Use ``key in index`` (``__contains__``) instead (:issue:`17753`).
889-
- ``DataFrame.iteritems`` and ``Series.iteritems`` have been deprecated. :attr:`DataFrame.items` and :attr:`Series.items` provide the exact same functionality and should be used instead (:issue:`26114`).
890889
- :meth:`DataFrame.get_dtype_counts` is deprecated. (:issue:`18262`)
891890
- :meth:`Categorical.ravel` will return a :class:`Categorical` instead of a ``np.ndarray`` (:issue:`27199`)
892891

pandas/core/frame.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ def items(self):
826826
for i, k in enumerate(self.columns):
827827
yield k, self._ixs(i, axis=1)
828828

829-
@Appender(items.__doc)
829+
@Appender(items.__doc__)
830830
def iteritems(self):
831831
return self.items()
832832

pandas/core/series.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,7 @@ def items(self):
17201720
"""
17211721
return zip(iter(self.index), iter(self))
17221722

1723-
@Appender(generic._shared_docs["iteritems"] % _shared_doc_kwargs)
1723+
@Appender(items.__doc__)
17241724
def iteritems(self):
17251725
return self.items()
17261726

0 commit comments

Comments
 (0)