Simplify typing by being stricter

Author: hwalinga

pandas/core/computation/parsing.py

@@ -63,7 +63,7 @@ def create_valid_python_identifier(name: str) -> str:
     return name
 
 
-def tokenize_and_clean_column_names(name: Union[str, int]) -> Union[str, int]:
+def clean_column_names(name: str) -> str:
     """Function to emulate the cleaning of a backtick quoted name.
 
     The purpose for this function is to see what happens to the name of
@@ -74,11 +74,8 @@ def tokenize_and_clean_column_names(name: Union[str, int]) -> Union[str, int]:
     Returns
     -------
     Returns the name after tokenizing and cleaning,
-    or 'name' if that operation failed, or is a number.
+    or 'name' if that operation failed.
     """
-    if not isinstance(name, str):
-        return name
-
     try:
         tokenized = tokenize_string(f"`{name}`")
         tokval = next(tokenized)[1]

pandas/core/generic.py

@@ -91,8 +91,6 @@
 from pandas.io.formats.printing import pprint_thing
 from pandas.tseries.frequencies import to_offset
 
-NameResolver = Dict[Union[str, int], ABCSeries]
-
 # goal is to be able to define the docs close to function, while still being
 # able to share
 _shared_docs: Dict[str, str] = dict()
@@ -425,7 +423,7 @@ def _get_block_manager_axis(cls, axis):
             return m - axis
         return axis
 
-    def _get_axis_resolvers(self, axis: str) -> NameResolver:
+    def _get_axis_resolvers(self, axis: str) -> Dict[str, ABCSeries]:
         # index or columns
         axis_index = getattr(self, axis)
         d = dict()
@@ -455,28 +453,28 @@ def _get_axis_resolvers(self, axis: str) -> NameResolver:
         d[axis] = dindex
         return d
 
-    def _get_index_resolvers(self) -> NameResolver:
-        from pandas.core.computation.parsing import tokenize_and_clean_column_names
+    def _get_index_resolvers(self) -> Dict[str, ABCSeries]:
+        from pandas.core.computation.parsing import clean_column_names
 
-        d: NameResolver = {}
+        d: Dict[str, ABCSeries] = {}
         for axis_name in self._AXIS_ORDERS:
             d.update(self._get_axis_resolvers(axis_name))
 
-        return {tokenize_and_clean_column_names(k): v for k, v in d.items()}
+        return {clean_column_names(k): v for k, v in d.items() if k is not int}
 
-    def _get_cleaned_column_resolvers(self) -> NameResolver:
+    def _get_cleaned_column_resolvers(self) -> Dict[str, ABCSeries]:
         """Return the special character free column resolvers of a dataframe.
 
         Column names with special characters are 'cleaned up' so that they can
         be referred to by backtick quoting.
         Used in :meth:`DataFrame.eval`.
         """
-        from pandas.core.computation.parsing import tokenize_and_clean_column_names
+        from pandas.core.computation.parsing import clean_column_names
 
         if isinstance(self, ABCSeries):
-            return {tokenize_and_clean_column_names(self.name): self}
+            return {clean_column_names(self.name): self}
 
-        return {tokenize_and_clean_column_names(k): v for k, v in self.items()}
+        return {clean_column_names(k): v for k, v in self.items() if k is not int}
 
     @property
     def _info_axis(self):