Skip to content

Commit 5688096

Browse files
WillAydjreback
authored andcommitted
Easy warning fixups for mypy (pandas-dev#27402)
1 parent 1fbc16d commit 5688096

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pandas/core/computation/pytables.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,15 @@ def pr(left, right):
9090

9191
k = klass
9292
if isinstance(left, ConditionBinOp):
93-
if isinstance(left, ConditionBinOp) and isinstance(
94-
right, ConditionBinOp
95-
):
93+
if isinstance(right, ConditionBinOp):
9694
k = JointConditionBinOp
9795
elif isinstance(left, k):
9896
return left
9997
elif isinstance(right, k):
10098
return right
10199

102100
elif isinstance(left, FilterBinOp):
103-
if isinstance(left, FilterBinOp) and isinstance(right, FilterBinOp):
101+
if isinstance(right, FilterBinOp):
104102
k = JointFilterBinOp
105103
elif isinstance(left, k):
106104
return left

pandas/io/json/_normalize.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def nested_to_record(
112112

113113

114114
def json_normalize(
115-
data: List[Dict],
115+
data: Union[Dict, List[Dict]],
116116
record_path: Optional[Union[str, List]] = None,
117117
meta: Optional[Union[str, List]] = None,
118118
meta_prefix: Optional[str] = None,
@@ -280,8 +280,6 @@ def _pull_field(js, spec):
280280
lengths = []
281281

282282
meta_vals = defaultdict(list) # type: DefaultDict
283-
if not isinstance(sep, str):
284-
sep = str(sep)
285283
meta_keys = [sep.join(val) for val in meta]
286284

287285
def _recursive_extract(data, path, seen_meta, level=0):

0 commit comments

Comments
 (0)