Merge pull request #178 from highcharts-for-python/develop

PR for v.1.8.0

Author: hcpchris

CHANGES.rst

@@ -1,4 +1,21 @@
 
+Release 1.8.0
+=========================================
+
+* **BUGFIX:** Fixed over-eager trimming of ``None`` data values when serializing ``.to_json()`` for
+  export via the Export Server. Closes #168.
+* **BUGFIX:** Fixed ``DumbbellSeries.data`` incorrect type (reverted from ``CartesianData`` to 
+  ``RangeData``-descended). Closes #176.
+* **BUGFIX:** Fixed coercion of `datetime.date` type values to milliseconds when serializaing ``.to_json()``
+  for export via the Export Server.
+* **ENHANCEMENT:** Added ``for_export`` as a special parameter to the ``.to_json()`` serialization method
+  to maintain past behavior while simultaneously fixing serialization bugs related to export via the Node
+  Export Server. Extended ``.trim_dict()`` and ``.trim_iterable()`` internal methods with ``for_export`` 
+  support for the same purpose.
+
+--------------------
+
+
 Release 1.7.6
 =========================================
 

highcharts_core/__version__.py

@@ -1 +1 @@
-__version__ = '1.7.6'
+__version__ = '1.8.0'

highcharts_core/constants.py

@@ -953,6 +953,39 @@ def __repr__(self):
 ]
 
 
+ALLOWED_NONE_CONTEXTS = [
+    "CartesianData.y",
+    "Cartesian3DData.y",
+    "Cartesian3DData.z",
+    "CartesianValueData.value",
+    "BarData.y",
+    "WaterfallData.y",
+    "WindBarbData.y",
+    "WindBarbData.value",
+    "XRangeData.y",
+    "BoxPlotData.low",
+    "BoxPlotData.high",
+    "BoxPlotData.median",
+    "BoxPlotData.q1",
+    "BoxPlotData.q3",
+    "VariablePieData.z",
+    "RangeData.low",
+    "RangeData.high",
+    
+    "HLCData.high",
+    "HLCData.low",
+    "HLCData.close",
+    "OHLCData.open",
+    "OHLCData.high",
+    "OHLCData.low",
+    "OHLCData.close",
+    "CandlestickData.open",
+    "CandlestickData.high",
+    "CandlestickData.low",
+    "CandlestickData.close",
+]
+
+
 DATA_COLUMN_TYPES = [
     'string',
     'number',

highcharts_core/headless_export.py

@@ -764,7 +764,7 @@ def request_chart(self,
                                                           'using a series type introduced in v.11. Sorry, but '
                                                           'that functionality is still forthcoming.')
 
-        options_as_json = self.options.to_json()
+        options_as_json = self.options.to_json(for_export = True)
         if isinstance(options_as_json, bytes):
             options_as_str = str(options_as_json, encoding = 'utf-8')
         else:
@@ -773,31 +773,31 @@ def request_chart(self,
         as_json = as_json.replace('"HIGHCHARTS FOR PYTHON: REPLACE WITH OPTIONS"',
                                   options_as_str)
         if self.callback:
-            callback_as_json = self.callback.to_json()
+            callback_as_json = self.callback.to_json(for_export = True)
             if isinstance(callback_as_json, bytes):
                 callback_as_str = str(callback_as_json, encoding = 'utf-8')
             else:
                 callback_as_str = callback_as_json
             as_json = as_json.replace('"HIGHCHARTS FOR PYTHON: REPLACE WITH CALLBACK"',
                                       callback_as_str)
         if self.global_options:
-            global_as_json = self.global_options.to_json()
+            global_as_json = self.global_options.to_json(for_export = True)
             if isinstance(global_as_json, bytes):
                 global_as_str = str(global_as_json, encoding = 'utf-8')
             else:
                 global_as_str = global_as_json
             as_json = as_json.replace('"HIGHCHARTS FOR PYTHON: REPLACE WITH GLOBAL"',
                                       global_as_str)
         if self.data_options:
-            data_as_json = self.data_options.to_json()
+            data_as_json = self.data_options.to_json(for_export = True)
             if isinstance(data_as_json, bytes):
                 data_as_str = str(data_as_json, encoding = 'utf-8')
             else:
                 data_as_str = data_as_json
             as_json = as_json.replace('"HIGHCHARTS FOR PYTHON: REPLACE WITH DATA"',
                                       data_as_str)
         if self.custom_code:
-            code_as_json = self.custom_code.to_json()
+            code_as_json = self.custom_code.to_json(for_export = True)
             if isinstance(code_as_json, bytes):
                 code_as_str = str(code_as_json, encoding = 'utf-8')
             else: