Revert "Fixed Issue pandas-dev#42447"

This reverts commit f69e0c3.

Author: Varun270

README.md

@@ -24,8 +24,8 @@
 structures designed to make working with "relational" or "labeled" data both
 easy and intuitive. It aims to be the fundamental high-level building block for
 doing practical, **real world** data analysis in Python. Additionally, it has
-the broader goal of becoming **the most powerful and flexible open-source data
-analysis/manipulation tool available in any language**. It is already well on
+the broader goal of becoming **the most powerful and flexible open source data
+analysis / manipulation tool available in any language**. It is already well on
 its way towards this goal.
 
 ## Main Features
@@ -107,14 +107,14 @@ pip install pandas
 See the [full installation instructions](https://pandas.pydata.org/pandas-docs/stable/install.html#dependencies) for minimum supported versions of required, recommended and optional dependencies.
 
 ## Installation from sources
-To install pandas the from source you need [Cython](https://cython.org/) in addition to the normal
+To install pandas from source you need [Cython](https://cython.org/) in addition to the normal
 dependencies above. Cython can be installed from PyPI:
 
 ```sh
 pip install cython
 ```
 
-In the `pandas` directory (the same one where you found this file after
+In the `pandas` directory (same one where you found this file after
 cloning the git repo), execute:
 
 ```sh
@@ -160,14 +160,14 @@ Most development discussions take place on GitHub in this repo. Further, the [pa
 
 All contributions, bug reports, bug fixes, documentation improvements, enhancements, and ideas are welcome.
 
-A detailed overview of how to contribute can be found in the **[contributing guide](https://pandas.pydata.org/docs/dev/development/contributing.html)**. There is also an [overview](.github/CONTRIBUTING.md) on GitHub.
+A detailed overview on how to contribute can be found in the **[contributing guide](https://pandas.pydata.org/docs/dev/development/contributing.html)**. There is also an [overview](.github/CONTRIBUTING.md) on GitHub.
 
-If you are simply looking to start working with the pandas codebase, navigate to the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) and start looking through interesting issues. There are several issues listed under [Docs](https://github.com/pandas-dev/pandas/issues?labels=Docs&sort=updated&state=open) and [good first issue](https://github.com/pandas-dev/pandas/issues?labels=good+first+issue&sort=updated&state=open) where you could start.
+If you are simply looking to start working with the pandas codebase, navigate to the [GitHub "issues" tab](https://github.com/pandas-dev/pandas/issues) and start looking through interesting issues. There are a number of issues listed under [Docs](https://github.com/pandas-dev/pandas/issues?labels=Docs&sort=updated&state=open) and [good first issue](https://github.com/pandas-dev/pandas/issues?labels=good+first+issue&sort=updated&state=open) where you could start out.
 
-You can also triage issues which may include reproducing bug reports or asking for vital information such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to pandas on CodeTriage](https://www.codetriage.com/pandas-dev/pandas).
+You can also triage issues which may include reproducing bug reports, or asking for vital information such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to pandas on CodeTriage](https://www.codetriage.com/pandas-dev/pandas).
 
 Or maybe through using pandas you have an idea of your own or are looking for something in the documentation and thinking ‘this can be improved’...you can do something about it!
 
-Feel free to ask questions on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or [Gitter](https://gitter.im/pydata/pandas).
+Feel free to ask questions on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata) or on [Gitter](https://gitter.im/pydata/pandas).
 
 As contributors and maintainers to this project, you are expected to abide by pandas' code of conduct. More information can be found at: [Contributor Code of Conduct](https://github.com/pandas-dev/pandas/blob/master/.github/CODE_OF_CONDUCT.md)

pandas/core/generic.py

@@ -4418,7 +4418,7 @@ def add_prefix(self: NDFrameT, prefix: str) -> NDFrameT:
         # expected "NDFrameT")
         # error: Argument 1 to "rename" of "NDFrame" has incompatible type
         # "**Dict[str, partial[str]]"; expected "Union[str, int, None]"
-        return self.rename(**mapper)  # type: ignore[return-value, arg-type]
+        return self.rename(**mapper)
 
     @final
     def add_suffix(self: NDFrameT, suffix: str) -> NDFrameT:
@@ -4482,7 +4482,7 @@ def add_suffix(self: NDFrameT, suffix: str) -> NDFrameT:
         # expected "NDFrameT")
         # error: Argument 1 to "rename" of "NDFrame" has incompatible type
         # "**Dict[str, partial[str]]"; expected "Union[str, int, None]"
-        return self.rename(**mapper)  # type: ignore[return-value, arg-type]
+        return self.rename(**mapper) 
 
     def sort_values(
         self,

pandas/core/series.py

@@ -4491,7 +4491,7 @@ def rename(
         ----------
         axis : {0 or "index"}
             Unused. Accepted for compatibility with DataFrame method only.
-        mapper : scalar, hashable sequence, dict-like or function, optional
+        index : scalar, hashable sequence, dict-like or function, optional
             Functions or dict-like are transformations to apply to
             the index.
             Scalar or hashable sequence-like will alter the ``Series.name``
@@ -4539,16 +4539,12 @@ def rename(
             # Make sure we raise if an invalid 'axis' is passed.
             axis = self._get_axis_number(axis)
 
-        if index is not None and mapper is not None:
-            raise TypeError("Cannot specify both 'mapper' and 'index'")
-        if mapper is None:
-            mapper = index
-        if callable(mapper) or is_dict_like(mapper):
+        if callable(index) or is_dict_like(index):
             return super()._rename(
-                mapper, copy=copy, inplace=inplace, level=level, errors=errors
+                index, copy=copy, inplace=inplace, level=level, errors=errors
             )
         else:
-            return self._set_name(mapper, inplace=inplace)
+            return self._set_name(index, inplace=inplace)
 
     @overload
     def set_axis(

pandas/tests/series/methods/test_rename.py

@@ -105,12 +105,6 @@ def test_rename_callable(self):
 
         assert result.name == expected.name
 
-    def test_rename_method_and_index(self):
-        # GH 40977
-        ser = Series([1, 2])
-        with pytest.raises(TypeError, match="Cannot specify both 'mapper' and 'index'"):
-            ser.rename(str, index=str)
-
     def test_rename_none(self):
         # GH 40977
         ser = Series([1, 2], name="foo")