Updated parse_wrmap to accept normal strings.

git-svn-id: http://www.winterrodeln.org/svn/wrpylib/trunk@2634 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index ffeedf1977b5ad11f270877930d79a24afd02d28..b6b55e6c301ff76fc77c9efae34425e708ccf0d3 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -176,7 +176,7 @@ WRMAP_LINE_TYPES = ['rodelbahn', 'gehweg', 'alternative', 'lift', 'anfahrt', 'li
 
 
 def parse_wrmap(wikitext):
-    """Parses the (unicode) u'<wrmap ...>content</wrmap>' of the Winterrodeln wrmap extension.
+    """Parses the '<wrmap ...>content</wrmap>' of the Winterrodeln wrmap extension.
     If wikitext does not contain the <wrmap> tag or if the <wrmap> tag contains 
     invalid formatted lines, a ParseError is raised.
     Use wrpylib.mwmarkup.find_tag(wikitext, 'wrmap') to find the wrmap tag within an arbitrary
@@ -184,7 +184,7 @@ def parse_wrmap(wikitext):
 
     :param wikitext: wikitext containing only the template. Example:
 
-    wikitext = u'''
+    wikitext = '''
     <wrmap lat="47.2417134" lon="11.21408895" zoom="14" width="700" height="400">
     <gasthaus name="Rosskogelhütte" wiki="Rosskogelhütte">47.240689 11.190454</gasthaus>
     <parkplatz>47.245789 11.238971</parkplatz>
@@ -200,7 +200,7 @@ def parse_wrmap(wikitext):
     """
     # parse XML
     try:
-        wrmap_xml = xml.etree.ElementTree.fromstring(wikitext.encode('utf-8'))
+        wrmap_xml = xml.etree.ElementTree.fromstring(wikitext)
     except xml.etree.ElementTree.ParseError as e:
         row, column = e.position
         raise ParseError("XML parse error on row {}, column {}: {}".format(row, column, e))