Use super() in dervived class and add comments to tests

Author: reidy-p

pandas/io/json/json.py

@@ -55,7 +55,7 @@ def to_json(path_or_buf, obj, orient=None, date_format='epoch',
  obj, orient=orient, date_format=date_format,
  double_precision=double_precision, ensure_ascii=force_ascii,
  date_unit=date_unit, default_handler=default_handler,
- index=index).write()
+ index=index)._write()
 
  if lines:
  s = _convert_to_line_delimits(s)
@@ -95,7 +95,7 @@ def __init__(self, obj, orient, date_format, double_precision,
  def _format_axes(self):
  raise AbstractMethodError(self)
 
- def write(self):
+ def _write(self):
  return dumps(
  self.obj,
  orient=self.orient,
@@ -115,18 +115,10 @@ def _format_axes(self):
  raise ValueError("Series index must be unique for orient="
  "'{orient}'".format(orient=self.orient))
 
- def write(self):
+ def _write(self):
  if not self.index and self.orient == 'split':
  self.obj = {"name": self.obj.name, "data": self.obj.values}
- return dumps(
- self.obj,
- orient=self.orient,
- double_precision=self.double_precision,
- ensure_ascii=self.ensure_ascii,
- date_unit=self.date_unit,
- iso_dates=self.date_format == 'iso',
- default_handler=self.default_handler
- )
+ return super(SeriesWriter, self)._write()
 
 
 class FrameWriter(Writer):
@@ -143,19 +135,11 @@ def _format_axes(self):
  raise ValueError("DataFrame columns must be unique for orient="
  "'{orient}'.".format(orient=self.orient))
 
- def write(self):
+ def _write(self):
  if not self.index and self.orient == 'split':
  self.obj = self.obj.to_dict(orient='split')
  del self.obj["index"]
- return dumps(
- self.obj,
- orient=self.orient,
- double_precision=self.double_precision,
- ensure_ascii=self.ensure_ascii,
- date_unit=self.date_unit,
- iso_dates=self.date_format == 'iso',
- default_handler=self.default_handler
- )
+ return super(FrameWriter, self)._write()
 
 
 class JSONTableWriter(FrameWriter):
@@ -205,21 +189,14 @@ def __init__(self, obj, orient, date_format, double_precision,
  self.obj = obj.reset_index()
  self.date_format = 'iso'
  self.orient = 'records'
+ self.index = index
 
- def write(self):
+ def _write(self):
  if not self.index:
  self.obj = self.obj.drop('index', axis=1)
- data = dumps(
- self.obj,
- orient=self.orient,
- double_precision=self.double_precision,
- ensure_ascii=self.ensure_ascii,
- date_unit=self.date_unit,
- iso_dates=self.date_format == 'iso',
- default_handler=self.default_handler
- )
+ data = super(JSONTableWriter, self)._write()
  serialized = '{{"schema": {schema}, "data": {data}}}'.format(
- schema=dumps(self.schema), data=data)
+  schema=dumps(self.schema), data=data)
  return serialized
 
 

pandas/tests/io/json/test_pandas.py

@@ -9,6 +9,7 @@
  read_json, compat)
 from datetime import timedelta
 import pandas as pd
+import json
 
 from pandas.util.testing import (assert_almost_equal, assert_frame_equal,
  assert_series_equal, network,
@@ -1151,7 +1152,8 @@ def test_data_frame_size_after_to_json(self):
  def test_index_false_to_json(self):
  # GH 17394
  # Testing index parameter in to_json
- import json
+
+ # Testing DataFrame.to_json(orient='split', index=False)
  df = pd.DataFrame([[1, 2], [4, 5]], columns=['a', 'b'])
 
  result = df.to_json(orient='split', index=False)
@@ -1164,6 +1166,7 @@ def test_index_false_to_json(self):
 
  assert result == expected
 
+ # Testing DataFrame.to_json(orient='table', index=False)
  result = df.to_json(orient='table', index=False)
  result = json.loads(result)
 
@@ -1180,6 +1183,7 @@ def test_index_false_to_json(self):
 
  assert result == expected
 
+ # Testing Series.to_json(orient='split', index=False)
  s = pd.Series([1, 2, 3], name='A')
 
  result = s.to_json(orient='split', index=False)
@@ -1192,6 +1196,7 @@ def test_index_false_to_json(self):
 
  assert result == expected
 
+ # Testing Series.to_json(orient='table', index=False)
  result = s.to_json(orient='table', index=False)
  result = json.loads(result)