changeset 1558:5628126794b4

Changed the rst parser to be compatible to the new docutils interface for directives.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Mon, 18 Sep 2006 11:59:01 +0200
parents 0eaaba71dfc0
children f0f228749435
files MoinMoin/parser/text_rst.py docs/CHANGES
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/text_rst.py	Sun Sep 17 18:53:05 2006 +0200
+++ b/MoinMoin/parser/text_rst.py	Mon Sep 18 11:59:01 2006 +0200
@@ -582,7 +582,10 @@
             state_machine.insert_input(lines, 'MoinDirectives')
         return
 
-    include.content = True
+    include.has_content = include.content = True
+    include.option_spec = {}
+    include.required_arguments = 1
+    include.optional_arguments = 0
 
     # Add additional macro directive.
     # This allows MoinMoin macros to be used either by using the directive
@@ -604,7 +607,10 @@
             return [ref]
         return
 
-    macro.content = True
+    macro.has_content = macro.content = True
+    macro.option_spec = {}
+    macro.required_arguments = 1
+    macro.optional_arguments = 0
 
 if ErrorParser: # fixup in case of missing docutils
     Parser = ErrorParser
--- a/docs/CHANGES	Sun Sep 17 18:53:05 2006 +0200
+++ b/docs/CHANGES	Mon Sep 18 11:59:01 2006 +0200
@@ -338,6 +338,8 @@
     * The thread monitor supports the Python 2.5 feature of directly grabbing
       the current stack frames of all threads now so it has become much faster.
     * Made the irssi parser more tolerant (Thanks to "TheAnarcat").
+    * Changed the rst parser to be compatible to the new docutils interface
+      for directives.
 
 
 Version 1.5-current: