summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2021-02-08 10:27:38 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-10-04 10:20:14 +0200
commitdf43f045d196912199be0c8434eea90f725aeb70 (patch)
treea1d0469acd5ca3584786eebb1c56bd35b21f10d2
parentfc21edba9aa849f6b3cf66418cde012406dc2f9d (diff)
downloadqtwebengine-chromium-df43f045d196912199be0c8434eea90f725aeb70.tar.gz
Enable build of tracing UI
Change-Id: Ie01ef53a6a264019eb61980927aa2ad781c5459d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/module.py4
-rw-r--r--chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/module.py b/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/module.py
index d27f350f7e5..bebf1b4659b 100644
--- a/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/module.py
+++ b/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/module.py
@@ -20,7 +20,7 @@ import inspect
import os
from py_vulcanize import js_utils
-import six
+#import six
class DepsException(Exception):
@@ -97,7 +97,7 @@ class Module(object):
"""
def __init__(self, loader, name, resource, load_resource=True):
- assert isinstance(name, six.string_types), 'Got %s instead' % repr(name)
+ #assert isinstance(name, six.string_types), 'Got %s instead' % repr(name)
global _next_module_id
self._id = _next_module_id
diff --git a/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py b/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py
index 88ce21820c5..441edc5ed0d 100644
--- a/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py
+++ b/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py
@@ -13,7 +13,6 @@ from py_vulcanize import html_generation_controller
from py_vulcanize import js_utils
from py_vulcanize import module
from py_vulcanize import strip_js_comments
-import six
def _AddToPathIfNeeded(path):
@@ -37,6 +36,7 @@ def _InitBeautifulSoup():
_InitBeautifulSoup()
import bs4
+import six
class Script(object):