Merge "Fix newline in three or more nested templates"

wikimedia · Jul 23, 2016 · fcc2e18 · fcc2e18
2 parents b798809 + cc98c76
commit fcc2e18
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
@@ -99,7 +99,7 @@
 }}
 |
 (?P<unhandled_depth>{{\s*[^{\|#0-9][^{\|#]*?\s* [^{]* {{ .* }})
-""", re.VERBOSE)
+""", re.VERBOSE | re.DOTALL)
 
 # The following regex supports wikilinks anywhere after the first pipe
 # and correctly matches the end of the file link if the wikilink contains

diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py
@@ -637,6 +637,16 @@ def test_regexes(self):
         self.assertIsNotNone(m.group('unhandled_depth'))
         self.assertTrue(m.group(0).endswith('foo {{bar}}'))
 
+        m = func('{{a|\n{{c|{{d|}} }}\n| foo  = bar }} foo {{bar}} baz')
+        self.assertIsNotNone(m)
+        self.assertIsNotNone(m.group(0))
+        self.assertIsNone(m.group('name'))
+        self.assertIsNone(m.group(1))
+        self.assertIsNone(m.group('params'))
+        self.assertIsNone(m.group(2))
+        self.assertIsNotNone(m.group('unhandled_depth'))
+        self.assertTrue(m.group(0).endswith('foo {{bar}}'))
+
 
 class TestGenericTemplateParams(PatchingTestCase):