diff MoinMoin/script/migration/_conv160.py @ 2599:13f0331f3a42

1.6 converter: add content conversion (unfinished), cleanup
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 04 Aug 2007 16:54:35 +0200
parents b609934451e6
children b601db2e4d34
line wrap: on
line diff
--- a/MoinMoin/script/migration/_conv160.py	Fri Aug 03 16:51:56 2007 +0200
+++ b/MoinMoin/script/migration/_conv160.py	Sat Aug 04 16:54:35 2007 +0200
@@ -54,7 +54,7 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import os.path, sys
+import os.path
 import codecs, urllib, glob
 
 from MoinMoin import config, wikiutil
@@ -62,13 +62,16 @@
 
 import mimetypes # this MUST be after wikiutil import!
 
+from _conv160_wiki import convert_wiki
+
 def markup_converter(text, renames):
     """ Convert the <text> content of some Page, using <renames> dict to rename
         links correctly. Additionally, convert some changed markup.
     """
     if "#format wiki" not in text and "#format" in text:
         return text # this is not a wiki page, leave it as is
-    # TODO convert markup of page
+
+    text = convert_wiki(text, renames)
     return text