Changeset 3145 for trac/plugins

Timestamp:

01/12/07 15:44:56 (6 years ago)

Author:

moschny

Message:

• Make the plugin compatible with Trac's current trunk (i.e. the upcoming 0.11 version):
  • IWikiMacroProvider interface change: The render_macro() method now gets a Formatter object instead of a Request.
  • Objects of type Formatter (or descendants thereof) are constructed with a single argument of type Context.
• Update the copyright notices.
• Bump the revision number to 4.0preX.

Location:

trac/plugins/tracnav-0.11

Files:

• README (modified) (1 diff)
• tracnav/__init__.py (modified) (1 diff)
• tracnav/tracnav.py (modified) (6 diffs)

trac/plugins/tracnav-0.11/README

@@ -66 +66 @@
 -------------------
 
-Copyright 2005, 2006
-- Bernhard Haumacher (haui at haumacher.de)
-- Thomas Moschny (moschny at ipd.uni-karlsruhe.de)
+Copyright 2005-2006, Bernhard Haumacher (haui at haumacher.de)
+Copyright 2005-2007, Thomas Moschny (moschny at ipd.uni-karlsruhe.de)
 
 This program is free software; you can redistribute it and/or modify

trac/plugins/tracnav-0.11/tracnav/__init__.py

@@ -1 @@
-__version__ = '3.92pre7'
+__version__ = '4.0pre1'

trac/plugins/tracnav-0.11/tracnav/tracnav.py

@@ -34 +34 @@
 == Author and License ==
 
-Copyright 2005, 2006
- *  Bernhard Haumacher (haui at haumacher.de)
- *  Thomas Moschny (moschny at ipd.uni-karlsruhe.de)
+ * Copyright 2005-2006, Bernhard Haumacher (haui at haumacher.de)
+ * Copyright 2005-2007, Thomas Moschny (moschny at ipd.uni-karlsruhe.de)
 
 {{{
@@ -77 +76 @@
     last wiki link.
     """
+    def __init__(self, context):
+        OneLinerFormatter.__init__(self, context)
+        self.lastlink = None
+
     def format_toc(self, wikitext):
-        self.link = None
+        self.lastlink = None
         out = StringIO()
         OneLinerFormatter.format(self, wikitext, out)
-        return out.getvalue(), self.link
-
-    def __init__(self, env, req = None):
-        OneLinerFormatter.__init__(self, env)
-        # OneLinerFormatter sets req to None
-        self.req = req
-        self.link = None
+        return out.getvalue(), self.lastlink
 
     def _make_link(self, namespace, target, match, label):
         if namespace == 'wiki':
-            self.link = target
+            self.lastlink = target
         return OneLinerFormatter._make_link(
             self, namespace, target, match, label)
@@ -97 +94 @@
     def _macro_formatter(self, match, fullmatch):
         name = fullmatch.group('macroname').lower()
-        if name == 'br':
-            return ' '
-        elif name in ALLOWED_MACROS:
+        if name in ALLOWED_MACROS:
             # leapfrog the OneLinerFormatter
             return Formatter._macro_formatter(self, match, fullmatch)
         else:
-            return ''
+            # use the OneLinerFormatter
+            return OneLinerFormatter._macro_formatter(self, match, fullmatch)
 
     # FIXME: what about _make_relative_link() ?
@@ -111 +107 @@
 class Invocation(object):
 
-    def __init__(self, env, req, args, out):
-
-        #save for later use
-        self.env = env
-        self.req = req
+    def __init__(self, formatter, args, out):
+
+        # save for later use
+        self.formatter = formatter
+
+        # shortcuts
+        self.env = formatter.env
+        self.req = formatter.req
+
+        # output
         self.out = out
         self.col = 0
         
-        #needed several times
-        self.preview = req.args.get('preview', '')
-        self.curpage = req.args.get('page', 'WikiStart')
-        self.modify = req.perm.has_permission('WIKI_MODIFY')
+        # needed several times
+        self.preview = self.req.args.get('preview', '')
+        self.curpage = self.req.args.get('page', 'WikiStart')
+        self.modify = self.req.perm.has_permission('WIKI_MODIFY')
 
         # parse arguments
@@ -149 +150 @@
         Parse and format the entries in toc_text.
         """
-        formatter = TocFormatter(self.env, self.req)
+        formatter = TocFormatter(self.formatter.context)
         for match in LISTRULE.finditer(toc_text):
             indent = len(match.group('indent'))
@@ -298 +299 @@
         yield 'JPNav' # legacy
 
-    def render_macro(self, req, name, args):
+    def render_macro(self, formatter, name, args):
         out = StringIO()
-        Invocation(self.env, req, args, out).run()
+        Invocation(formatter, args, out).run()
         return out.getvalue()