Merge remote-tracking branch 'upstream/master' into untyped-defs

pandas/core/arrays/sparse/array.py

@@ -795,10 +795,6 @@ def __getitem__(self, key):
             key = check_array_indexer(self, key)
 
             if com.is_bool_indexer(key):
-                # pandas\core\arrays\sparse\array.py:799: error: Argument 1 to
-                # "check_bool_indexer" has incompatible type "SparseArray";
-                # expected "Index"  [arg-type]
-                key = check_bool_indexer(self, key)  # type: ignore
 
                 return self.take(np.arange(len(key), dtype=np.int32)[key])
             elif hasattr(key, "__len__"):
@@ -1472,38 +1468,11 @@ def _unary_method(self, op) -> "SparseArray":
     def __pos__(self) -> "SparseArray":
         return self._unary_method(operator.pos)
 
-    @classmethod
-    def _add_unary_ops(cls):
-        # pandas\core\arrays\sparse\array.py:1487: error: Unsupported operand
-        # type for unary + ("Type[SparseArray]")  [operator]
-        cls.__pos__ = cls._create_unary_method(operator.pos)  # type: ignore[operator]
-        # pandas\core\arrays\sparse\array.py:1488: error: Unsupported operand
-        # type for unary - ("Type[SparseArray]")  [operator]
-        cls.__neg__ = cls._create_unary_method(operator.neg)  # type: ignore[operator]
-        # pandas\core\arrays\sparse\array.py:1489: error: Unsupported operand
-        # type for ~ ("Type[SparseArray]")  [operator]
-        cls.__invert__ = cls._create_unary_method(  # type: ignore[operator]
-            operator.invert
-        )
+    def __neg__(self) -> "SparseArray":
+        return self._unary_method(operator.neg)
 
-    @classmethod
-    def _add_comparison_ops(cls):
-        # pandas\core\arrays\sparse\array.py:1493: error: Unsupported left
-        # operand type for & ("Type[SparseArray]")  [operator]
-        cls.__and__ = cls._create_comparison_method(  # type: ignore[operator]
-            operator.and_
-        )
-        # pandas\core\arrays\sparse\array.py:1494: error: Unsupported left
-        # operand type for | ("Type[SparseArray]")  [operator]
-        cls.__or__ = cls._create_comparison_method(  # type: ignore[operator]
-            operator.or_
-        )
-        # pandas\core\arrays\sparse\array.py:1495: error: Unsupported left
-        # operand type for ^ ("Type[SparseArray]")  [operator]
-        cls.__xor__ = cls._create_arithmetic_method(  # type: ignore[operator]
-            operator.xor
-        )
-        super()._add_comparison_ops()
+    def __invert__(self) -> "SparseArray":
+        return self._unary_method(operator.invert)
 
     # ----------
     # Formatting

pandas/core/frame.py

@@ -9319,10 +9319,8 @@ def _AXIS_NAMES(self) -> Dict[int, str]:
 ops.add_special_arithmetic_methods(DataFrame)
 
 
-def _from_nested_dict(data):
-    # pandas\core\frame.py:9280: error: Need type annotation for 'new_data'
-    # [var-annotated]
-    new_data = collections.defaultdict(dict)  # type: ignore[var-annotated]
+def _from_nested_dict(data) -> collections.defaultdict:
+    new_data: collections.defaultdict = collections.defaultdict(dict)
     for index, s in data.items():
         for col, v in s.items():
             new_data[col][index] = v