Moved function rodelbahnbox_to_sledrun to another place in the file.

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

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index a702af177b2d190c0b0d1f020cece8ec8fcba1e8..27d82e37c7d88285cfcfb7d44477246c6eff3753 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -27,26 +27,6 @@ def _conv(fnct, value, fieldname):
     except formencode.Invalid as e: raise formencode.Invalid(u"Conversion error in field '%s': %s" % (fieldname, unicode(e)), e.value, e.state)
 
 
-def rodelbahnbox_to_sledrun(wikitext, sledrun=None):
-    """Converts a sledrun wiki page containing the {{Rodelbahnbox}}
-    to a sledrun. sledrun may be an instance of WrSledrunCache or an "empty" class (object()) (default).
-    Raises a formencode.Invalid exception if the format is not OK or the Rodelbahnbox is not found.
-    :return: (start, end, sledrun) tuple of the Rodelbahnbox."""
-    # find Rodelbahnbox
-    start, end = wrpylib.mwmarkup.find_template(wikitext, u'Rodelbahnbox')
-    if start is None: raise formencode.Invalid(u"Rodelbahnbox nicht gefunden", wikitext, None)
-
-    # convert to sledrun
-    if sledrun is None:
-        state = None
-    else:
-        class State(object):
-            pass
-        state = State()
-        state.sledrun = sledrun
-    return start, end, RodelbahnboxValidator().to_python(wikitext[start:end], state)
-
-
 class RodelbahnboxDictConverter(formencode.Validator):
     """Converts a dict with Rodelbahnbox properties to a Sledrun class. Does no validation."""
 
@@ -136,6 +116,26 @@ class RodelbahnboxValidator(wrpylib.wrvalidators.RodelbahnboxDictValidator):
         self.chained_validators = [RodelbahnboxDictConverter()]
 
 
+def rodelbahnbox_to_sledrun(wikitext, sledrun=None):
+    """Converts a sledrun wiki page containing the {{Rodelbahnbox}}
+    to a sledrun. sledrun may be an instance of WrSledrunCache or an "empty" class (object()) (default).
+    Raises a formencode.Invalid exception if the format is not OK or the Rodelbahnbox is not found.
+    :return: (start, end, sledrun) tuple of the Rodelbahnbox."""
+    # find Rodelbahnbox
+    start, end = wrpylib.mwmarkup.find_template(wikitext, u'Rodelbahnbox')
+    if start is None: raise formencode.Invalid(u"Rodelbahnbox nicht gefunden", wikitext, None)
+
+    # convert to sledrun
+    if sledrun is None:
+        state = None
+    else:
+        class State(object):
+            pass
+        state = State()
+        state.sledrun = sledrun
+    return start, end, RodelbahnboxValidator().to_python(wikitext[start:end], state)
+
+
 def sledrun_to_rodelbahnbox(sledrun, version=None):
     """Converts a sledrun class to the {{Rodelbahnbox}} representation.
     The sledrun class has to have properties like position_latitude, ...