Purge Highcharts from Orange distribution

LICENSE

@@ -6,9 +6,6 @@ All rights reserved.
 THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY WHATSOEVER.
 
 If you use or redistribute this software, you are permitted to do so
-under the terms of [GNU GPL v3+] license.
+under the terms of GNU [GPL-3.0]+ license.
 
-In addition, some parts of the program are distributed under different
-license terms. Please see ATTRIBUTION file for details.
-
-[GNU GPL v3+]: https://www.gnu.org/licenses/gpl-3.0.en.html
+[GPL-3.0]: https://www.gnu.org/licenses/gpl-3.0.en.html

Orange/canvas/report/report.py

@@ -154,23 +154,27 @@ def report_plot(self, name=None, plot=None):
         """
         if not (isinstance(name, str) and plot is None):
             name, plot = self._fix_args(name, plot)
+
         from pyqtgraph import PlotWidget, PlotItem, GraphicsWidget, GraphicsView
-        from Orange.widgets.highcharts import Highchart
+        from Orange.widgets.utils.webview import WebviewWidget
+
         self.report_name(name)
         if plot is None:
             plot = getdeepattr(self, self.graph_name)
-        if isinstance(plot, QGraphicsScene):
-            self.report_html += get_html_img(plot)
-        elif isinstance(plot, PlotItem):
+        if isinstance(plot, (QGraphicsScene, PlotItem)):
             self.report_html += get_html_img(plot)
         elif isinstance(plot, PlotWidget):
             self.report_html += get_html_img(plot.plotItem)
         elif isinstance(plot, GraphicsWidget):
             self.report_html += get_html_img(plot.scene())
         elif isinstance(plot, GraphicsView):
             self.report_html += get_html_img(plot)
-        elif isinstance(plot, Highchart):
-            self.report_html += plot.svg()
+        elif isinstance(plot, WebviewWidget):
+            try:
+                svg = plot.svg()
+            except IndexError:
+                svg = plot.html()
+            self.report_html += svg
 
     # noinspection PyBroadException
     def report_table(self, name, table=None, header_rows=0, header_columns=0,