The googlemap extension tag is googlemap, not googlemaps.

[philipp/winterrodeln/wrpylib.git] / wrpylib / mwmarkup.py

diff --git a/wrpylib/mwmarkup.py b/wrpylib/mwmarkup.py
index dbe9baeda64b321939c3fb9d09561a2bb4fe8535..30b2f654fa4236190a17fb3b631a116a2c304365 100644 (file)
--- a/wrpylib/mwmarkup.py
+++ b/wrpylib/mwmarkup.py
@@ -108,11 +108,11 @@ def create_template(template_title, anonym_params=[], named_param_keys=[], named
 
 def parse_googlemap(wikitext, detail=False):
     """Parses the (unicode) u'<googlemap ...>content</googlemap>' of the googlemap extension
-    out of a page. If wikitext does not contain the googlemaps extension text None is returned.
+    out of a page. If wikitext does not contain the googlemap extension text None is returned.
     If the googlemap contains invalid formatted lines, a RuntimeError is raised.
 
     :param wikitext: wikitext containing the template. Example:
-    :param detail: bool. If True, start and end position of <googlemaps>...</googlemap> is
+    :param detail: bool. If True, start and end position of <googlemap>...</googlemap> is
         returned additionally.
 
     wikitext = '''
@@ -159,7 +159,7 @@ def parse_googlemap(wikitext, detail=False):
         if not match is None: return (float(match.group(2)), float(match.group(1)), None, None)
         return RuntimeError(u'Could not parse line ' + line)
 
-    regexp = re.compile(u"(<googlemap[^>]*>)(.*)(</googlemap>)", re.DOTALL)
+    regexp = re.compile(u"(<googlemap[^>]*>)(.*?)(</googlemap>)", re.DOTALL)
     match = regexp.search(wikitext)
     if match is None: return None
     start = match.start()