Helpviewer/AdBlock/AdBlockRule.py

branch
5_2_x
changeset 1948
8789c9075050
parent 1509
c0b5e693b0eb
child 2303
0ed4ed026c16
--- a/Helpviewer/AdBlock/AdBlockRule.py	Sat Jul 14 14:52:14 2012 +0200
+++ b/Helpviewer/AdBlock/AdBlockRule.py	Sun Jul 15 17:28:40 2012 +0200
@@ -173,18 +173,20 @@
         """
         pattern = wildcardPattern
         
-        pattern = re.sub(r"\*+", "*", pattern)      # remove multiple wildcards
-        pattern = re.sub(r"\^\|$", "^", pattern)    # remove anchors following separator placeholder
-        pattern = re.sub(r"^(\*)", "", pattern)     # remove leading wildcards
-        pattern = re.sub(r"(\*)$", "", pattern)     # remove trailing wildcards
-        pattern = re.sub(r"(\W)", "", pattern)      # escape special symbols
+        pattern = re.sub(r"\*+", "*", pattern)       # remove multiple wildcards
+        pattern = re.sub(r"\^\|$", "^", pattern)     # remove anchors following separator
+                                                     # placeholder
+        pattern = re.sub(r"^(\*)", "", pattern)      # remove leading wildcards
+        pattern = re.sub(r"(\*)$", "", pattern)      # remove trailing wildcards
+        pattern = re.sub(r"(\W)", r"\\\1", pattern)  # escape special symbols
         pattern = re.sub(r"^\\\|\\\|",
-            r"^[\w\-]+:\/+(?!\/)(?:[^\/]+\.)?", pattern)  # process extended anchor at expression start
+            r"^[\w\-]+:\/+(?!\/)(?:[^\/]+\.)?", pattern)  # process extended anchor at
+                                                          # expression start
         pattern = re.sub(r"\\\^",
-            r"(?:[^\w\d\-.%]|$)", pattern)          # process separator placeholders
-        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 .*
+            r"(?:[^\w\d\-.%]|$)", pattern)           # process separator placeholders
+        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 .*
         
         return pattern
     

eric ide

mercurial