diff -r 9eed155411f0 -r 4a1db75550bd eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Sat Oct 10 16:03:53 2020 +0200
+++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Sun Oct 11 17:54:52 2020 +0200
@@ -7,10 +7,10 @@
Module implementing the GreaseMonkey script.
"""
+import re
from PyQt5.QtCore import (
- pyqtSignal, pyqtSlot, QObject, QUrl, QRegExp, QByteArray,
- QCryptographicHash
+ pyqtSignal, pyqtSlot, QObject, QUrl, QByteArray, QCryptographicHash
)
from PyQt5.QtGui import QIcon, QPixmap, QImage
from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply
@@ -284,10 +284,13 @@
if self.__fileName not in self.__fileWatcher.files():
self.__fileWatcher.addPath(self.__fileName)
- rx = QRegExp("// ==UserScript==(.*)// ==/UserScript==")
- rx.indexIn(fileData)
- metaDataBlock = rx.cap(1).strip()
+ rx = re.compile("// ==UserScript==(.*)// ==/UserScript==")
+ match = rx.search(fileData)
+ if match is None:
+ # invalid script file
+ return
+ metaDataBlock = match.group(1).strip()
if metaDataBlock == "":
# invalid script file
return
