From 90344f96b8d7f159518104b901b477a2f8f59cc6 Mon Sep 17 00:00:00 2001 From: llby Date: Sun, 8 May 2016 01:05:04 +0900 Subject: [PATCH 1/2] Does not support dict title [#34] --- pandas_highcharts/core.py | 5 ++++- pandas_highcharts/tests.py | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pandas_highcharts/core.py b/pandas_highcharts/core.py index f7edabc..3fc78bb 100644 --- a/pandas_highcharts/core.py +++ b/pandas_highcharts/core.py @@ -116,7 +116,10 @@ def serialize_subtitle(df, output, *args, **kwargs): def serialize_title(df, output, *args, **kwargs): if "title" in kwargs: - output["title"] = {"text": kwargs["title"]} + if isinstance(kwargs["title"], dict): + output["title"] = kwargs["title"] + else: + output["title"] = {"text": kwargs["title"]} def serialize_tooltip(df, output, *args, **kwargs): if 'tooltip' in kwargs: diff --git a/pandas_highcharts/tests.py b/pandas_highcharts/tests.py index 55e7dde..dab7460 100644 --- a/pandas_highcharts/tests.py +++ b/pandas_highcharts/tests.py @@ -14,7 +14,6 @@ {'a': 2, 'b': 4, 'c': 6, 't': datetime.datetime(2015, 1, 2), 's': 's2'} ]) - class CoreTest(TestCase): def test_type(self): self.assertEqual(type(serialize(df, render_to="chart")), str) @@ -74,6 +73,14 @@ def test_type(self): for yaxis in obj.get('yAxis', []): self.assertTrue(yaxis.get('tickPositions')) + obj = serialize(df, render_to="chart", output_type="dict", title={"text": 'Chart',"x": -20}, xticks=[1], yticks=[2]) + print obj + self.assertTrue(obj.get('title', {}).get('text')) + self.assertTrue(obj.get('title', {}).get('x')) + self.assertTrue(obj.get('xAxis', {}).get('tickPositions')) + for yaxis in obj.get('yAxis', []): + self.assertTrue(yaxis.get('tickPositions')) + obj = serialize(df, render_to="chart", output_type="dict", fontsize=12, kind='pie', x='s', y=['a'], tooltip={'pointFormat': '{series.name}: {point.percentage:.1f}%'}) self.assertTrue(obj.get('tooltip')) @@ -97,3 +104,5 @@ def test_jsonencoder(self): self.assertEqual(json_encode(datetime.date(2015, 1, 1)), "1420070400000") self.assertEqual(json_encode(datetime.datetime(2015, 1, 1)), "1420070400000") self.assertEqual(json_encode(pandas.tslib.Timestamp(1420070400000000000)), "1420070400000") + + From 52e2224ff0c7f1d8c48900d87efcf12dcf4f577e Mon Sep 17 00:00:00 2001 From: llby Date: Sun, 8 May 2016 08:52:36 +0900 Subject: [PATCH 2/2] Does not support dict title [#34] oops --- pandas_highcharts/tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas_highcharts/tests.py b/pandas_highcharts/tests.py index dab7460..1b336e9 100644 --- a/pandas_highcharts/tests.py +++ b/pandas_highcharts/tests.py @@ -74,7 +74,6 @@ def test_type(self): self.assertTrue(yaxis.get('tickPositions')) obj = serialize(df, render_to="chart", output_type="dict", title={"text": 'Chart',"x": -20}, xticks=[1], yticks=[2]) - print obj self.assertTrue(obj.get('title', {}).get('text')) self.assertTrue(obj.get('title', {}).get('x')) self.assertTrue(obj.get('xAxis', {}).get('tickPositions'))