changeset 444:918c58dcc275

Fixed PythonErrorEditingFrontPage. imported from: moin--main--1.5--patch-448
author Alexander Schremmer <alex@alexanderweb.de.tla>
date Thu, 16 Feb 2006 17:43:13 +0000
parents f2f1db293930
children a71176d858be
files ChangeLog MoinMoin/formatter/pagelinks.py MoinMoin/parser/wiki.py docs/CHANGES
diffstat 4 files changed, 23 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 16 16:29:03 2006 +0000
+++ b/ChangeLog	Thu Feb 16 17:43:13 2006 +0000
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-02-16 18:43:13 GMT	Alexander Schremmer <alex@alexanderweb.de.tla>	patch-448
+
+    Summary:
+      Fixed PythonErrorEditingFrontPage.
+    Revision:
+      moin--main--1.5--patch-448
+
+
+    modified files:
+     ChangeLog MoinMoin/formatter/pagelinks.py
+     MoinMoin/parser/wiki.py docs/CHANGES
+
+
 2006-02-16 17:29:03 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-447
 
     Summary:
--- a/MoinMoin/formatter/pagelinks.py	Thu Feb 16 16:29:03 2006 +0000
+++ b/MoinMoin/formatter/pagelinks.py	Thu Feb 16 17:43:13 2006 +0000
@@ -20,40 +20,11 @@
     
     # All these must be overriden here because they raise
     # NotImplementedError!@#! or return html?! in the base class.
-    set_highlight_re = null
-    url = null
-    image = null
-    smiley = null
-    text = null
-    strong = null
-    emphasis = null
-    underline = null
-    highlight = null
-    sup = null
-    sub = null
-    strike = null
-    code = null
-    preformatted = null
-    small = null
-    big = null
-    code_area = null
-    code_line = null
-    code_token = null
-    linebreak = null
-    paragraph = null
-    rule = null
-    icon = null
-    number_list = null
-    bullet_list = null
-    listitem = null
-    definition_list = null
-    definition_term = null
-    definition_desc = null
-    heading = null
-    table = null
-    table_row = null
-    table_cell = null
-    attachment_link = null
-    attachment_image = null
-    attachment_drawing = null
+    set_highlight_re = rawHTML = url = image = smiley = text = null
+    strong = emphasis = underline =  highlight = sup = sub = strike = null
+    code = preformatted = small = big = code_area = code_line = null
+    code_token = linebreak = paragraph = rule = icon = null
+    number_list = bullet_list = listitem = definition_list = null
+    definition_term = definition_desc = heading = table = null
+    table_row = table_cell = attachment_link = attachment_image = attachment_drawing = null
 
--- a/MoinMoin/parser/wiki.py	Thu Feb 16 16:29:03 2006 +0000
+++ b/MoinMoin/parser/wiki.py	Thu Feb 16 17:43:13 2006 +0000
@@ -693,7 +693,7 @@
                 else:
                     attrs['bgcolor'] = '"#%s"' % arg
             else:
-                msg = None
+                msg = ""
             #print "key: %s\nattrs: %s" % (key, str(attrs))
             return self.formatter.rawHTML(msg)
 
--- a/docs/CHANGES	Thu Feb 16 16:29:03 2006 +0000
+++ b/docs/CHANGES	Thu Feb 16 17:43:13 2006 +0000
@@ -56,6 +56,8 @@
     * the algorithm used for processing the farmconfig.wikis list was changed
       to work for big farms (>= 50 wikis), too. This works around the python
       "re" module limitation of having a maximum of 100 named groups in a RE.
+    * Fixed a TypeError which occurred for formatters that dislike None values.
+      (cf. http://moinmoin.wikiwikiweb.de/MoinMoinBugs/PythonErrorEditingFrontPage)
 
 
 Version 1.5.2: