Ticket #2415: 02-reload-templates-fix.patch

turbokid/kidsupport.py

@@ -121 +121 @@
                         ttime = mtime
                     # Check the status of all base moduls.
                     for module in _get_extended_modules(tclass):
-                        mtime = stat(sys.modules[module].__file__).st_mtime
+                        # In some situations module will not exist in
+                        # sys.modules dict and we should correctly handle
+                        # this situation to prevent from KeyError exception
+                        # raising.
+                        # Load mtime of base module from cache
+                        # in this situation
+                        try:
+                            mtime = stat(sys.modules[module].__file__).st_mtime
+                        except KeyError:
+                            mtime = ct[module]
+
                         if mtime > ct[module]:
                             # base template has changed
                             del sys.modules[module]
                             ct[module] = mtime
                             reload_template = True
+
                         if mtime > ttime:
                             # base module has changed
                             reload_template = True
@@ -152 +163 @@
                     ttime = stat(sys.modules[classname].__file__).st_mtime
                     for module in _get_extended_modules(tclass):
                         mtime = stat(sys.modules[module].__file__).st_mtime
-                        ct[module] = mtime
+
+                        # we must use setdefault instead of ct[module] = mtime
+                        # to prevent from modification already calculated max
+                        # mtimes for loaded base templates
+                        ct.setdefault(module, mtime)
+
                         if mtime > ttime:
                             ttime = mtime
                     # Store max of mtimes of template and all of its bases.