Update Macro for full 0.11 compatibility

[HeX]

Hi, I just found this nice Macro and it does exactly what I was looking for. It runs in my 0.11 installation but triggers the pre-0.11 warning. Also the reference of tickets does not work in 0.11 (I don't mind that since I probably won't use this). I don't know if this has something to do with 0.11 or if it's a bug in in itself.

When I enter this example

[[Poll(Which of these do you prefer?; #1; #2; #3; Cheese dip)]]

I get this error message displayed:

Error: Macro Poll(Which of these do you prefer?; #1; #2; #3; Cheese dip) failed

'NoneType' object has no attribute 'ticket'

Thanks, Dietmar

[Alec Thomas]

Fixed in r4092.

[HeX]

r4092 fixes the ticket and reference errors but the macro still triggers a pre-0.11 warning:

WARNING: Executing pre-0.11 Wiki macro Poll by provider <class 'tracpoll.tracpoll.PollMacro'+

The legacy support will stop in 0.12 at which time this macro will not work any more (see also ​line 156 of formatter.py and ​line 61 of macros.py).

[HeX]

OK I had a look around and actually managed to get rid of the warnings (solutions found in ​trac:ticket:4568 and ​this Wiki page).

I created the following patch which hopefully will be accepted:

tracpoll/tracpoll.py

@@ -121 +121 @@
     base_dir = Option('poll', 'base_dir', '/tmp',
                       'Path where poll pickle dumps should be stored.')
 
-    def render_macro(self, req, name, content):
+    def expand_macro(self, formatter, name, content):
+        req = formatter.req
         content = filter(None, [i.strip() for i in
                                 content.replace(';', '\n').split('\n')])
         title = content.pop(0)

[Alec Thomas]

(In [4103]) Applied patch from dietmarw. Thanks! Fixes #3487.