[PATCH] make it working with Trac-1.0

[falkb]

Trying today's SVN revision of this plugin I noticed it doesn't work with Trac 1.0, just strange errors like "... macro ... no longer supported ..." appear as desribed ​here.

I was able to fix it for me with the hint of hasienda. It works for me now on Trac-1.0.0. Here are my 2 little patches:

wikitablemacro/0.11/wikitable/table.py

@@ -33 +33 @@
     
     # Render macro
     
-    def render_macro(self, req, name, content):
+    def expand_macro(self, formatter, name, content):
         db = self.env.get_db_cnx()
         cursor = db.cursor()
         cursor.execute(content)
+
+        req = formatter.req
         
         out = StringIO()

wikitablemacro/0.11/wikitable/scalar.py

@@ -23 +23 @@
     
     # Render macro
     
-    def render_macro(self, req, name, content):
+    def expand_macro(self, formatter, name, content):
         db = self.env.get_db_cnx()
         cursor = db.cursor()
         cursor.execute(content)
@@ -36 +36 @@
     out = StringIO() 
     print >>out, u"<span class='wikiscalar'>%s</span>" % value
 
-        add_stylesheet(req, 'wikitable/css/wikitable.css')
+        add_stylesheet(formatter.req, 'wikitable/css/wikitable.css')
         return Markup(out.getvalue())

[Ryan J Ollos]

The patch looks great. I will commit it after I get some sleep :)

[Ryan J Ollos]

(In [12455]) Fixes #10718 (0.2dev): Use Trac 0.11+ API, replacing implementation of render_macro with expand_macro.