jenkins-bot has submitted this change and it was merged.
Change subject: Increase resilience to CFD template formatting
......................................................................
Increase resilience to CFD template formatting
Allows for spaces in regex used to parse HTML commenting
Change-Id: Ia24d2b15f38d0d29a969a65355b2b9d479c2b416
---
M catlib.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/catlib.py b/catlib.py
index 67f1dcc..a222008 100644
--- a/catlib.py
+++ b/catlib.py
@@ -581,7 +581,7 @@
matchcfd = re.compile(r"{{%s.*?}}" % regexName, re.IGNORECASE)
pageText = matchcfd.sub('', pageText)
matchcomment = re.compile(
- r"<!--BEGIN CFD TEMPLATE-->.*<!--END CFD TEMPLATE-->",
+ r"<!--\s*?BEGIN CFD TEMPLATE\s*?-->.*?<!--\s*?END CFD
TEMPLATE\s*?-->",
re.IGNORECASE | re.MULTILINE | re.DOTALL)
pageText = matchcomment.sub('', pageText)
pos = 0
--
To view, visit https://gerrit.wikimedia.org/r/122119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia24d2b15f38d0d29a969a65355b2b9d479c2b416
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Cyde <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
