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

PR for v.1.4.3

Author: hcpchris

CHANGES.rst

@@ -1,3 +1,10 @@
+Release 1.4.3
+=========================================
+
+* **BUGFIX**: Fixed error in ``FlagsSeries`` serialization and added unit test.
+
+---------------------
+
 Release 1.4.2
 =========================================
 

highcharts_stock/__version__.py

@@ -1 +1 @@
-__version__ = '1.4.2'
+__version__ = '1.4.3'

highcharts_stock/options/series/flags.py

@@ -65,7 +65,25 @@ def data(self, value):
         if not is_ndarray(value) and not value:
             self._data = None
         else:
-            self._data = SingleXData.from_array(value)
+            self._data = self._data_point_class().from_array(value)
+
+    @classmethod
+    def _data_collection_class(cls):
+        """Returns the class object used for the data collection.
+        
+        :rtype: :class:`DataPointCollection <highcharts_core.options.series.data.collections.DataPointCollection>`
+          descendent
+        """
+        return SingleXDataCollection
+    
+    @classmethod
+    def _data_point_class(cls):
+        """Returns the class object used for individual data points.
+        
+        :rtype: :class:`DataBase <highcharts_core.options.series.data.base.DataBase>` 
+          descendent
+        """
+        return SingleXData
 
     @classmethod
     def _get_kwargs_from_dict(cls, as_dict):
@@ -192,6 +210,7 @@ def _to_untrimmed_dict(self, in_cls = None) -> dict:
         }
         untrimmed_parents = mro__to_untrimmed_dict(self, in_cls = in_cls) or {}
         for key in untrimmed_parents:
-            untrimmed[key] = untrimmed_parents[key]
+            if key not in untrimmed:
+                untrimmed[key] = untrimmed_parents[key]
 
         return untrimmed

tests/options/series/test_flags.py

@@ -57,3 +57,22 @@ def test_FlagsSeries_to_dict(kwargs, error):
 ])
 def test_FlagsSeries_from_js_literal(input_files, filename, as_file, error):
     Class_from_js_literal(cls, input_files, filename, as_file, error)
+
+
+def test_FlagsSeries_to_js_literal():
+    data_points = [{'x': 1635255000000, 'title': 'Sell'},
+                   {'x': 1635427800000, 'title': 'Sell'},
+                   {'x': 1636119000000, 'title': 'Buy'},
+                   {'x': 1636381800000, 'title': 'Buy'},
+                   {'x': 1636468200000, 'title': 'Sell'}]
+    flag_series = cls(data = data_points,
+                      on_series = 'dataseries',
+                      shape = 'squarepin',
+                      name = 'Flags on series')
+    assert flag_series is not None
+    assert isinstance(flag_series, cls) is True
+    
+    result = flag_series.to_js_literal()
+    assert result is not None
+    assert isinstance(result, str) is True
+    assert 'data:' in result