From 3a59c28767f199f4c0813f2573f52ec0a6a025fa Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Apr 02 2019 14:34:57 +0000
Subject: Fix JSONP format


Signed-off-by: Lukas Holecek <hluk@email.cz>

---

diff --git a/functional-tests/test_api_v1.py b/functional-tests/test_api_v1.py
index 1e43869..a4c3c4d 100644
--- a/functional-tests/test_api_v1.py
+++ b/functional-tests/test_api_v1.py
@@ -2,6 +2,7 @@
 
 import json
 import pytest
+import re
 
 from textwrap import dedent
 
@@ -67,8 +68,9 @@ def test_version_endpoint(requests_session, greenwave_server):
 def test_about_endpoint_jsonp(requests_session, greenwave_server):
     r = requests_session.get(greenwave_server + 'api/v1.0/about?callback=bac123')
     assert r.status_code == 200
-    assert 'bac123' in r.text
-    assert '"version": "%s"' % __version__ in r.text
+    expected = 'bac123({"version":"%s"});' % __version__
+    actual = re.sub(r'\s+', '', r.text)
+    assert expected == actual
 
 
 @pytest.mark.smoke
diff --git a/greenwave/utils.py b/greenwave/utils.py
index 05fb680..7c499c0 100644
--- a/greenwave/utils.py
+++ b/greenwave/utils.py
@@ -56,7 +56,7 @@ def jsonp(func):
             resp = func(*args, **kwargs)
             resp.set_data('{}({});'.format(
                 str(callback),
-                resp.get_data()
+                resp.get_data().decode('utf-8')
             ))
             resp.mimetype = 'application/javascript'
             return resp