upgrade mypy-0.720 typed-ast-1.4.0

Author: simonjayhawkins

pandas/core/arrays/base.py

@@ -1164,10 +1164,9 @@ def _maybe_convert(arr):
 
             if op.__name__ in {"divmod", "rdivmod"}:
                 a, b = zip(*res)
-                res = _maybe_convert(a), _maybe_convert(b)
-            else:
-                res = _maybe_convert(res)
-            return res
+                return _maybe_convert(a), _maybe_convert(b)
+
+            return _maybe_convert(res)
 
         op_name = ops._get_op_name(op, True)
         return set_function_name(_binop, op_name, cls)

pandas/core/indexes/base.py

@@ -458,6 +458,7 @@ def __new__(
             return Index(np.asarray(data), dtype=dtype, copy=copy, name=name, **kwargs)
         elif data is None or is_scalar(data):
             cls._scalar_data_error(data)
+            return None
         else:
             if tupleize_cols and is_list_like(data):
                 # GH21470: convert iterable to list before determining if empty

pandas/core/ops/__init__.py

@@ -858,7 +858,10 @@ def wrapper(self, other):
 
         # For int vs int `^`, `|`, `&` are bitwise operators and return
         #   integer dtypes.  Otherwise these are boolean ops
-        filler = fill_int if is_self_int_dtype and is_other_int_dtype else fill_bool
+        if is_self_int_dtype and is_other_int_dtype:
+            filler = fill_int
+        else:
+            filler = fill_bool
         res_values = na_op(self.values, ovalues)
         unfilled = self._constructor(res_values, index=self.index, name=res_name)
         filled = filler(unfilled)

pandas/core/util/hashing.py

@@ -2,6 +2,7 @@
 data hash pandas / numpy objects
 """
 import itertools
+from typing import Iterator
 
 # error: No library stub file for module 'numpy'
 import numpy as np  # type: ignore
@@ -113,7 +114,7 @@ def hash_pandas_object(
         h = Series(h, index=obj.index, dtype="uint64", copy=False)
 
     elif isinstance(obj, ABCDataFrame):
-        hashes = (hash_array(series.values) for _, series in obj.items())
+        hashes: Iterator = (hash_array(series.values) for _, series in obj.items())
         num_items = len(obj.columns)
         if index:
             index_hash_generator = (
@@ -123,7 +124,7 @@ def hash_pandas_object(
                     encoding=encoding,
                     hash_key=hash_key,
                     categorize=categorize,
-                ).values  # noqa
+                ).values
                 for _ in [None]
             )
             num_items += 1