diff -r f606dbe20be6 -r 000ea446ff4b WebBrowser/GreaseMonkey/GreaseMonkeyScript.py
--- a/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Sat May 13 13:46:05 2017 +0200
+++ b/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Sat May 13 16:32:54 2017 +0200
@@ -10,7 +10,7 @@
from __future__ import unicode_literals
from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl, QRegExp, \
- QByteArray, QCryptographicHash, qVersion
+ QByteArray, QCryptographicHash
from PyQt5.QtWebEngineWidgets import QWebEngineScript
from .GreaseMonkeyJavaScript import bootstrap_js, values_js
@@ -19,6 +19,8 @@
from ..Tools.DelayedFileWatcher import DelayedFileWatcher
from ..WebBrowserPage import WebBrowserPage
+from Globals import qVersionTuple
+
class GreaseMonkeyScript(QObject):
"""
@@ -328,7 +330,7 @@
QByteArray(self.fullName().encode("utf-8")),
QCryptographicHash.Md4).toHex()).decode("ascii")
valuesScript = values_js.format(nspace)
- if qVersion() < "5.8.0":
+ if qVersionTuple() < (5, 8, 0):
runCheck = """
for (var value of {0}) {{
var re = new RegExp(value);
@@ -370,7 +372,7 @@
@rtype QWebEngineScript
@exception ValueError raised to indicate an unsupported start point
"""
- if qVersion() < "5.8.0":
+ if qVersionTuple() < (5, 8, 0):
if self.startAt() == GreaseMonkeyScript.DocumentStart:
injectionPoint = QWebEngineScript.DocumentCreation
elif self.startAt() == GreaseMonkeyScript.DocumentEnd:
@@ -385,7 +387,7 @@
bootstrap_js, self.__script
))
script.setName(self.fullName())
- if qVersion() < "5.8.0":
+ if qVersionTuple() < (5, 8, 0):
script.setInjectionPoint(injectionPoint)
script.setWorldId(WebBrowserPage.SafeJsWorld)
script.setRunsOnSubFrames(not self.__noFrames)
@@ -401,7 +403,7 @@
@return JavaScript script containing the list
@rtype str
"""
- if qVersion() >= "5.8.0":
+ if qVersionTuple() >= (5, 8, 0):
script = ""
else:
patternList = []
