Breaking Python 2.4 compatibility of 2.2.2

[Jun Omae]

I got the following error with Python 2.4.

TemplateSyntaxError: invalid syntax (/home/jun66j5/.python-eggs/TracThemeEngine-2.2.2dev-py2.4.egg-tmp/themeengine/templates/admin_theme_advanced.html, line 37)

TemplateSyntaxError: invalid syntax (/home/jun66j5/.python-eggs/TracThemeEngine-2.2.2dev-py2.4.egg-tmp/themeengine/templates/admin_theme.html, line 50)

The template files use expr if cond else expr syntax introduced in Python 2.5.

themeengine/templates/admin_theme.html

@@ -47 +47 @@
       <div id="themebuttons">
         <img src="${href.chrome('themeengine', 'img', 'next.gif')}" border="0" id="nextbutton" />
         <img src="${href.chrome('themeengine', 'img', 'prev.gif')}" border="0" id="prevbutton" />
-        <input type="submit" value="${dgettext('themeengine', 'Use this theme')}" class="${'btn' if bhdb else None}"/>
+        <input type="submit" value="${dgettext('themeengine', 'Use this theme')}" class="${(None, 'btn')[bool(bhdb)]}" />
       </div>
     </form>
 

themeengine/templates/admin_theme_advanced.html

@@ -34 +34 @@
         <textarea name="css" rows="40" cols="80">$css</textarea>
       </fieldset>
       <div class="buttons">
-        <input type="submit" value="${dgettext('themeengine', 'Submit')}" class="${'btn' if bhdb else None}" />
+        <input type="submit" value="${dgettext('themeengine', 'Submit')}" class="${(None, 'btn')[bool(bhdb)]}" />
       </div>
     </form>
   </body>

[Olemis Lang]

In 13788:

ThemeEnginePlugin [ fixes #11638 ] Remove x if c else y expressions from templates