From f3967edd0b7f226f9ff3cffe0493f9bd6d2cd2a3 Mon Sep 17 00:00:00 2001
From: sophiaverhoeffexcentis
 <103590661+sophiaverhoeffexcentis@users.noreply.github.com>
Date: Tue, 18 Jul 2023 14:49:41 +0200
Subject: [PATCH 1/2] Update highcharts.py

decode JS and CSS source files + adjusted CSSSource
---
 highcharts_excentis/highcharts/highcharts.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/highcharts_excentis/highcharts/highcharts.py b/highcharts_excentis/highcharts/highcharts.py
index 241ab7f..156867f 100644
--- a/highcharts_excentis/highcharts/highcharts.py
+++ b/highcharts_excentis/highcharts/highcharts.py
@@ -75,7 +75,7 @@ def __init__(self, **kwargs):
 
         # set CSS src
         self.CSSsource = [
-                'https://www.highcharts.com/highslide/highslide.css',
+                'https://code.highcharts.com/6/css/highcharts.css',
 
             ]
 
@@ -348,12 +348,17 @@ def buildhtmlheader(self):
             opener.addheaders = [('User-Agent', 'Mozilla/5.0')]
 
             self.header_css = [
-                '<style>%s</style>' % opener.open(h).read() for h in self.CSSsource
+                '<style>' +
+                opener.open(source).read().decode('ASCII').replace('\n', '') +
+                '</style>' for source in self.CSSsource
             ]
 
             self.header_js = [
-                '<script type="text/javascript">%s</script>' % opener.open(h).read() for h in self.JSsource
+                '<script type="text/javascript">' +
+                opener.open(source).read().decode('ASCII').replace('\n', '') +
+                '</script>' for source in self.JSsource
             ]
+            
         else:
             self.header_css = [
                 '<link href="%s" rel="stylesheet" />' % h for h in self.CSSsource

From 09378a3f98b08dba8ed2f81808bcba3788f81581 Mon Sep 17 00:00:00 2001
From: Tom Ghyselinck <tom.ghyselinck@linbox.be>
Date: Wed, 19 Jul 2023 09:57:16 +0200
Subject: [PATCH 2/2] Prefer decoding to 'utf-8'

---
 highcharts_excentis/highcharts/highcharts.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/highcharts_excentis/highcharts/highcharts.py b/highcharts_excentis/highcharts/highcharts.py
index 156867f..3084568 100644
--- a/highcharts_excentis/highcharts/highcharts.py
+++ b/highcharts_excentis/highcharts/highcharts.py
@@ -349,13 +349,13 @@ def buildhtmlheader(self):
 
             self.header_css = [
                 '<style>' +
-                opener.open(source).read().decode('ASCII').replace('\n', '') +
+                opener.open(source).read().decode('utf-8').replace('\n', '') +
                 '</style>' for source in self.CSSsource
             ]
 
             self.header_js = [
                 '<script type="text/javascript">' +
-                opener.open(source).read().decode('ASCII').replace('\n', '') +
+                opener.open(source).read().decode('utf-8').replace('\n', '') +
                 '</script>' for source in self.JSsource
             ]