[Checkins] SVN: grok/trunk/src/grok/ Fix
https://launchpad.net/grok/+bug/83952: Application objects are not
Philipp von Weitershausen
philikon at philikon.de
Thu Feb 8 11:57:55 EST 2007
Log message for revision 72463:
Fix https://launchpad.net/grok/+bug/83952: Application objects are not
neccessarily also container-like objects
Changed:
U grok/trunk/src/grok/components.py
U grok/trunk/src/grok/ftests/admin/admin.py
U grok/trunk/src/grok/tests/application/application.py
-=-
Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py 2007-02-08 16:20:46 UTC (rev 72462)
+++ grok/trunk/src/grok/components.py 2007-02-08 16:57:54 UTC (rev 72463)
@@ -112,7 +112,7 @@
pass
-class Application(Site, Container):
+class Application(Site):
"""A top-level application object."""
@@ -247,7 +247,7 @@
def __init__(self, filename, _prefix=None):
_prefix = self.get_path_from_prefix(_prefix)
super(PageTemplateFile, self).__init__(filename, _prefix)
-
+
# __grok_module__ is needed to make defined_locally() return True for
# inline templates
# XXX unfortunately using caller_module means that
Modified: grok/trunk/src/grok/ftests/admin/admin.py
===================================================================
--- grok/trunk/src/grok/ftests/admin/admin.py 2007-02-08 16:20:46 UTC (rev 72462)
+++ grok/trunk/src/grok/ftests/admin/admin.py 2007-02-08 16:57:54 UTC (rev 72463)
@@ -34,7 +34,7 @@
"""
import grok
-class MammothManager(grok.Application):
+class MammothManager(grok.Application, grok.Container):
pass
class Index(grok.View):
Modified: grok/trunk/src/grok/tests/application/application.py
===================================================================
--- grok/trunk/src/grok/tests/application/application.py 2007-02-08 16:20:46 UTC (rev 72462)
+++ grok/trunk/src/grok/tests/application/application.py 2007-02-08 16:57:54 UTC (rev 72463)
@@ -13,8 +13,6 @@
Applications are both containers and sites::
- >>> issubclass(calendar_app, grok.Container)
- True
>>> issubclass(calendar_app, grok.Site)
True
More information about the Checkins
mailing list