Skip to content

Commit 701c140

Browse files
author
dickreuter
committed
adjusted formatting
1 parent 3c94206 commit 701c140

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

pandas/io/json.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,6 @@ def json_normalize(data, record_path=None, meta=None,
747747
always present
748748
* raise: will raise KeyError if keys listed in meta are not
749749
always present
750-
751750
.. versionadded:: 0.20.0
752751
753752
Returns
@@ -854,8 +853,10 @@ def _recursive_extract(data, path, seen_meta, level=0):
854853
if errors == 'ignore':
855854
meta_val = np.nan
856855
else:
857-
raise KeyError("Try running with errors='ignore'"
858-
"as key %s is not always present.", e)
856+
raise \
857+
KeyError("Try running with "
858+
"errors='ignore' as key "
859+
"%s is not always present", e)
859860
meta_vals[key].append(meta_val)
860861

861862
records.extend(recs)

pandas/io/tests/json/test_json_norm.py

+13-10
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ def test_nested_flattens(self):
225225

226226
self.assertEqual(result, expected)
227227

228-
229228
def test_json_normalize_errors(self):
230229
# GH14583: If meta keys are not always present
231230
# a new option to set errors='ignore' has been implemented
@@ -263,20 +262,24 @@ def test_json_normalize_errors(self):
263262
}
264263
]
265264
}
266-
j = json_normalize(data=i['Trades'], record_path=[['general', 'stocks']],
267-
meta=[['general', 'tradeid'], ['general', 'trade_version']],
265+
j = json_normalize(data=i['Trades'],
266+
record_path=[['general', 'stocks']],
267+
meta=[['general', 'tradeid'],
268+
['general', 'trade_version']],
268269
errors='ignore')
269-
expected={'general.trade_version': {0: 1.0, 1: 1.0, 2: '', 3: ''},
270-
'general.tradeid': {0: 100, 1: 100, 2: 100, 3: 100},
271-
'name': {0: 'Apple', 1: 'Google', 2: 'Apple', 3: 'Google'},
272-
'price': {0: '0', 1: '0', 2: '0', 3: '0'},
273-
'symbol': {0: 'AAPL', 1: 'GOOG', 2: 'AAPL', 3: 'GOOG'}}
270+
expected = {'general.trade_version': {0: 1.0, 1: 1.0, 2: '', 3: ''},
271+
'general.tradeid': {0: 100, 1: 100, 2: 100, 3: 100},
272+
'name': {0: 'Apple', 1: 'Google', 2: 'Apple', 3: 'Google'},
273+
'price': {0: '0', 1: '0', 2: '0', 3: '0'},
274+
'symbol': {0: 'AAPL', 1: 'GOOG', 2: 'AAPL', 3: 'GOOG'}}
274275

275276
self.assertEqual(j.fillna('').to_dict(), expected)
276277

277278
self.assertRaises(KeyError,
278-
json_normalize, data=i['Trades'], record_path=[['general', 'stocks']],
279-
meta=[['general', 'tradeid'], ['general', 'trade_version']],
279+
json_normalize, data=i['Trades'],
280+
record_path=[['general', 'stocks']],
281+
meta=[['general', 'tradeid'],
282+
['general', 'trade_version']],
280283
errors='raise'
281284
)
282285

0 commit comments

Comments
 (0)