Commit 16ffd79c authored by Jérome Perrin's avatar Jérome Perrin

web py3

parent 5d6bdfd9
...@@ -25,7 +25,10 @@ ...@@ -25,7 +25,10 @@
# #
############################################################################## ##############################################################################
import six
from six.moves.html_parser import HTMLParser from six.moves.html_parser import HTMLParser
class HtmlParseHelper(HTMLParser): class HtmlParseHelper(HTMLParser):
""" """
Listens to all the HTMLParser methods and push results in a list of tuple. Listens to all the HTMLParser methods and push results in a list of tuple.
...@@ -131,5 +134,10 @@ def parseCssForUrl(text): ...@@ -131,5 +134,10 @@ def parseCssForUrl(text):
result.append(("data", data)) result.append(("data", data))
return result return result
def unescape(self, html): if six.PY2:
def unescape(self, html):
return HTMLParser().unescape(html) return HTMLParser().unescape(html)
else:
from html import unescape as html_unescape
def unescape(self, html):
return html_unescape(self, html)
...@@ -129,14 +129,13 @@ class TestStaticWebSiteRedirection(ERP5TypeTestCase): ...@@ -129,14 +129,13 @@ class TestStaticWebSiteRedirection(ERP5TypeTestCase):
# Test service worker URL # Test service worker URL
self.assertEqual(response.status, six.moves.http_client.OK, '%s: %s' % (response.status, url_to_check)) self.assertEqual(response.status, six.moves.http_client.OK, '%s: %s' % (response.status, url_to_check))
self.assertEqual(response.getheader('Content-Type'), 'application/javascript') self.assertEqual(response.getheader('Content-Type'), 'application/javascript')
self.assertTrue('self.registration.unregister()' in response_body, self.assertIn(b'self.registration.unregister()', response_body)
response_body)
else: else:
self.assertEqual(response.status, status_to_assert, '%s: %s' % (response.status, url_to_check)) self.assertEqual(response.status, status_to_assert, '%s: %s' % (response.status, url_to_check))
self.assertEqual(response.getheader(LOCATION), redirect_location) self.assertEqual(response.getheader(LOCATION), redirect_location)
self.assertEqual(response.getheader('Content-Type'), 'text/plain; charset=utf-8') self.assertEqual(response.getheader('Content-Type'), 'text/plain; charset=utf-8')
self.assertEqual(response_body, redirect_location) self.assertEqual(response_body.decode('utf-8'), redirect_location)
############################################################################## ##############################################################################
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment