diff -r 9986ec0e559a -r 10516539f238 Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py Tue Oct 15 22:03:54 2013 +0200
+++ b/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py Fri Oct 18 23:00:41 2013 +0200
@@ -20,6 +20,7 @@
@param string string to match (string)
@param pattern pattern to be used (string)
+ @return flag indicating a successful match (boolean)
"""
stringSize = len(string)
@@ -75,6 +76,7 @@
Public method to match the given URL.
@param urlString URL to match (string)
+ @return flag indicating a successful match (boolean)
"""
if self.__useRegExp:
return self.__regExp.indexIn(urlString) != -1
@@ -93,14 +95,18 @@
self.__regExp = QRegExp(pattern, Qt.CaseInsensitive)
self.__useRegExp = True
elif ".tld" in pattern:
- pattern = re.sub(r"(\W)", r"\\\1", pattern) # escape special symbols
- pattern = re.sub(r"\*+", "*", pattern) # remove multiple wildcards
- pattern = re.sub(r"^\\\|", "^", pattern) # process anchor at expression
- # start
- pattern = re.sub(r"\\\|$", "$", pattern) # process anchor at expression
- # end
- pattern = re.sub(r"\\\*", ".*", pattern) # replace wildcards by .*
- pattern = re.sub(r"\.tld", r"\.[a-z.]{2,6}") # replace domain pattern
+ # escape special symbols
+ pattern = re.sub(r"(\W)", r"\\\1", pattern)
+ # remove multiple wildcards
+ pattern = re.sub(r"\*+", "*", pattern)
+ # process anchor at expression start
+ pattern = re.sub(r"^\\\|", "^", pattern)
+ # process anchor at expression end
+ pattern = re.sub(r"\\\|$", "$", pattern)
+ # replace wildcards by .*
+ pattern = re.sub(r"\\\*", ".*", pattern)
+ # replace domain pattern
+ pattern = re.sub(r"\.tld", r"\.[a-z.]{2,6}")
self.__useRegExp = True
self.__regExp = QRegExp(pattern, Qt.CaseInsensitive)
