Changeset 12173

Timestamp:

Oct 16, 2012, 2:37:02 AM (12 years ago)

Author:

Olemis Lang

Message:

ThemeEnginePlugin: Fixes #9580 infinite recursion issue in Trac=1.0

Location:

themeengineplugin/trunk

Files:

• setup.py (modified) (1 diff)
• themeengine/api.py (modified) (3 diffs)

themeengineplugin/trunk/setup.py

@@ -15 +15 @@
 setup(
     name = 'TracThemeEngine',
-    version = '2.0.1',
+    version = '2.1.0',
     packages = ['themeengine'],
     package_data = { 'themeengine': ['templates/*.html', 'htdocs/*.js', 'htdocs/*.css', 'htdocs/img/*.gif',

themeengineplugin/trunk/themeengine/api.py

@@ -13 +13 @@
 from trac.core import *
 from trac.config import Option
+
+try:
+    from trac.util import lazy
+except ImportError:
+    lazy = None
 
 class ThemeNotFound(TracError):
@@ -68 +73 @@
     
     def __init__(self):
-        # This can safely go in here because the data can only change on a restart anyway
-        self.info = {}
+        if lazy is None:
+            # Trac < 1.0 : this can safely go in here because the data can 
+            # only change on a restart anyway
+            self.info = self.info()
+
+    def info(self):
+        # Trac >= 1.0 : Hack needed to deal with infinite recursion error
+        #    Details : http://trac-hacks.org/ticket/9580#comment:1
+        #    Details : http://trac-hacks.org/ticket/9580#comment:2
+        info = {}
         for provider in self.providers:
             for name in provider.get_theme_names():
@@ -76 +89 @@
                 theme['module'] = provider.__class__.__module__
                 theme['name'] = name
-                self.info[name.lower()] = theme
-                
+                info[name.lower()] = theme
+        return info
+
+    if lazy is not None:
+        info = lazy(info)
+
     # IThemeProvider methods
     def get_theme_names(self):