Renamed template_to_table to format_template_table.

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

diff --git a/tests/test_mwmarkup.py b/tests/test_mwmarkup.py
index c9f386374014594d431500bbfe11222671a74d07..1f2e939fa424d35eaa488d114ff68aff3db14cbe 100644 (file)
--- a/tests/test_mwmarkup.py
+++ b/tests/test_mwmarkup.py
@@ -60,7 +60,7 @@ class TestMwParserFromHell(unittest.TestCase):
         template.add('Aufstieg möglich', 'Ja')
         self.assertEqual(template, '{{Rodelbahnbox|Unbenannt|Position=47.309820 N 9.986508 E|Aufstieg möglich=Ja}}')
 
-        wrpylib.mwmarkup.template_to_table(template)
+        wrpylib.mwmarkup.format_template_table(template)
         self.assertEqual(template,
             '{{Rodelbahnbox\n' +
             '| Unbenannt\n' +
@@ -68,7 +68,7 @@ class TestMwParserFromHell(unittest.TestCase):
             '| Aufstieg möglich = Ja\n' +
             '}}')
 
-        wrpylib.mwmarkup.template_to_table(template, 18)
+        wrpylib.mwmarkup.format_template_table(template, 18)
         self.assertEqual(template,
             '{{Rodelbahnbox\n' +
             '| Unbenannt\n' +
@@ -118,7 +118,7 @@ class TestMwParserFromHell(unittest.TestCase):
         template.add('Aufstieg möglich', 'Ja')
         self.assertEqual(template, '{{Rodelbahnbox|Unbenannt|Position=47.309820 N 9.986508 E|Aufstieg möglich=Ja}}')
 
-        wrpylib.mwmarkup.template_to_table(template)
+        wrpylib.mwmarkup.format_template_table(template)
         self.assertEqual(template,
             '{{Rodelbahnbox\n' +
             '| Unbenannt\n' +

diff --git a/wrpylib/mwmarkup.py b/wrpylib/mwmarkup.py
index dd2d6bf6d2fb6f96f5a56bad9ae0a7edad3344c1..2eb89c0d709a6223d98a12dc2321c7f60474360e 100644 (file)
--- a/wrpylib/mwmarkup.py
+++ b/wrpylib/mwmarkup.py
@@ -16,12 +16,12 @@ class ParseError(RuntimeError):
     pass
 
 
-def template_to_table(template, keylen=None):
+def format_template_table(template, keylen=None):
     """Reformat the given template to be tabular.
 
     >>> template
     {{foo|bar|bazz=7}}
-    >>> template_to_table(template)
+    >>> format_template_table(template)
     {{foo
     | bar
     | bazz = 7

diff --git a/wrpylib/wrvalidators.py b/wrpylib/wrvalidators.py
index 9d9f1b69c7466dc734cb15ae826ec6851fba159d..09bba89071858b01ccd4f88e260420ad551ea584 100644 (file)
--- a/wrpylib/wrvalidators.py
+++ b/wrpylib/wrvalidators.py
@@ -18,7 +18,7 @@ from collections import OrderedDict, namedtuple
 
 import mwparserfromhell
 
-from wrpylib.mwmarkup import template_to_table
+from wrpylib.mwmarkup import format_template_table
 
 
 # FromToConverter type
@@ -765,7 +765,7 @@ def rodelbahnbox_from_str(value):
 
 def rodelbahnbox_to_str(value):
     template = rodelbahnbox_to_template(value)
-    template_to_table(template, 20)
+    format_template_table(template, 20)
     return str(template)
 
 
@@ -805,7 +805,7 @@ def gasthausbox_from_str(value):
 
 def gasthausbox_to_str(value):
     template = gasthausbox_to_template(value)
-    template_to_table(template, 17)
+    format_template_table(template, 17)
     return str(template)