[PATCH] Project index fails

[Mikael Relbe]

Project index fails as of r10176 due to incorrect parameter usage on line 699 in trac/web/main.py.

Please change to the following instead:

trac/web/main.py

@@ -696 +696 @@
             req.hdf['projects'] = projects
             req.display(template)
 
-        loader = TemplateLoader(loadpaths, variable_lookup='lenient', encoding='utf-8')
+        loader = TemplateLoader(loadpaths, variable_lookup='lenient',
+                                default_encoding='utf-8')
         tmpl = loader.load(template)
         stream = tmpl.generate(**data)
-        output = stream.render('xhtml', doctype=DocType.XHTML_STRICT, encoding='utf-8')
+        output = stream.render('xhtml', doctype=DocType.XHTML_STRICT,
+                               encoding='utf-8')
         req.send(output, 'text/html')
 
     except RequestDone:

Line 702 is a nit-picking change to keep line length below 79 chars, according to TracDev/CodingStyle, you know :)

[Christian Boos]

Well spotted!

Did you verify the fix with genshi-3k, as r10176 was actually a follow-up to r10168 meant to provide support for this experimental genshi branch? (details in r10168).

[Mikael Relbe]

Replying to cboos:

Well spotted!

Did you verify the fix with genshi-3k /…/

No, it was verified with Genshi 0.6. I checked the description of milestone:0.13, which currently states "requires Genshi 0.6"… Perhaps change the requirement of Genshi version/branch instead?

[Christian Boos]

No, no problem if you tried with Genshi 0.6. I'll check with genshi-3k, which is by no way a requirement (only a "nice to have" compatibility, and will hopefully help Simon to get his changes into mainline Genshi).

[Mikael Relbe]

My proposal above is in line with r10168, so I think it's safe to just apply the patch to the Trac trunk to recover.

[Christian Boos]

Correct, patch applied in r10216. Thanks!

I just verified, actually r10176 broke it for genshi-3k as well ;-)