From 0f9df590c99ececcf1ead404dfac8d7c6a0b1f26 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Mon, 15 Jul 2019 09:45:22 -0700 Subject: [PATCH] Easy warning fixups for mypy --- pandas/core/computation/pytables.py | 6 ++---- pandas/io/json/_normalize.py | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pandas/core/computation/pytables.py b/pandas/core/computation/pytables.py index e4e005c024345..8ba01670bd879 100644 --- a/pandas/core/computation/pytables.py +++ b/pandas/core/computation/pytables.py @@ -90,9 +90,7 @@ def pr(left, right): k = klass if isinstance(left, ConditionBinOp): - if isinstance(left, ConditionBinOp) and isinstance( - right, ConditionBinOp - ): + if isinstance(right, ConditionBinOp): k = JointConditionBinOp elif isinstance(left, k): return left @@ -100,7 +98,7 @@ def pr(left, right): return right elif isinstance(left, FilterBinOp): - if isinstance(left, FilterBinOp) and isinstance(right, FilterBinOp): + if isinstance(right, FilterBinOp): k = JointFilterBinOp elif isinstance(left, k): return left diff --git a/pandas/io/json/_normalize.py b/pandas/io/json/_normalize.py index a6fde86297a3d..24a255c78f3c0 100644 --- a/pandas/io/json/_normalize.py +++ b/pandas/io/json/_normalize.py @@ -112,7 +112,7 @@ def nested_to_record( def json_normalize( - data: List[Dict], + data: Union[Dict, List[Dict]], record_path: Optional[Union[str, List]] = None, meta: Optional[Union[str, List]] = None, meta_prefix: Optional[str] = None, @@ -280,8 +280,6 @@ def _pull_field(js, spec): lengths = [] meta_vals = defaultdict(list) # type: DefaultDict - if not isinstance(sep, str): - sep = str(sep) meta_keys = [sep.join(val) for val in meta] def _recursive_extract(data, path, seen_meta, level=0):