[Checkins] SVN: grokcore.view/trunk/ test that inheriting template directive informatiomn across packages now works, even if the name of the package of the inherited component is grokked later due to import order

[Jan-Wijbrand Kolman]

Log message for revision 120595:
  test that inheriting template directive informatiomn across packages now works, even if the name of the package of the inherited component is grokked later due to import order

Changed:
  U   grokcore.view/trunk/buildout.cfg
  U   grokcore.view/trunk/src/grokcore/view/meta/views.py
  U   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package.py
  A   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/more_templates/
  A   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/more_templates/moretemplate.pt
  U   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub.py
  A   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub_templates/
  A   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub_templates/subtemplate.pt
  A   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/subtemplatedir.py
  U   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase.py
  A   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/basetemplate.pt
  D   grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/view.pt

-=-
Modified: grokcore.view/trunk/buildout.cfg
===================================================================
--- grokcore.view/trunk/buildout.cfg	2011-02-28 12:09:34 UTC (rev 120594)
+++ grokcore.view/trunk/buildout.cfg	2011-02-28 12:40:03 UTC (rev 120595)
@@ -7,7 +7,6 @@
 versions = versions
 extensions = buildout.dumppickedversions
 
-
 [versions]
 grokcore.view =
 
@@ -16,9 +15,8 @@
 eggs = grokcore.view
 interpreter = python
 
-
 [test]
 recipe = zc.recipe.testrunner
 eggs = grokcore.view
        grokcore.view[test]
-defaults = ['--tests-pattern', '^f?tests$', '-v']
+defaults = ['--tests-pattern', '^f?tests$', '-v', '--auto-color', '--auto-progress']

Modified: grokcore.view/trunk/src/grokcore/view/meta/views.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/meta/views.py	2011-02-28 12:09:34 UTC (rev 120594)
+++ grokcore.view/trunk/src/grokcore/view/meta/views.py	2011-02-28 12:40:03 UTC (rev 120595)
@@ -51,7 +51,8 @@
             discriminator=None,
             callable=self.associate_template,
             args=(factory.module_info, factory),
-            order=self._template_order)
+            order=self._template_order
+            )
         # We increase _template_order to maintain the relative order of
         # template association between the different Grok extensions
         # (like an implicit template can be inherited between two

Modified: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package.py	2011-02-28 12:09:34 UTC (rev 120594)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package.py	2011-02-28 12:40:03 UTC (rev 120595)
@@ -1,7 +1,29 @@
 """
-  >>> import cross_package_fixture
 
-  >>> grok.testing.grok(cross_package_fixture.__name__)
+  >>> grok.testing.grok('grokcore.view.tests.view.cross_package_fixture')
 
+  >>> from grokcore.view import template
+  >>> from cross_package_fixture import zbase
+  >>> from cross_package_fixture.subpackage import sub
+  >>> from cross_package_fixture.subpackage import subtemplatedir
+
+  >>> template.bind().get(zbase.BaseView)
+  ('grokcore.view.tests.view.cross_package_fixture.zbase', 'basetemplate')
+
+  >>> template.bind().get(sub.SubView)
+  ('grokcore.view.tests.view.cross_package_fixture.zbase', 'basetemplate')
+
+  >>> template.bind().get(sub.SubViewOverrideTemplate)
+  ('grokcore.view.tests.view.cross_package_fixture.subpackage.sub',
+   'subtemplate')
+
+  >>> template.bind().get(subtemplatedir.MoreSubView)
+  ('grokcore.view.tests.view.cross_package_fixture.zbase', 'basetemplate')
+
+  >>> template.bind().get(subtemplatedir.MoreSubViewOverrideTemplate)
+  ('grokcore.view.tests.view.cross_package_fixture.subpackage.subtemplatedir',
+   'moretemplate')
+
+
 """
 import grokcore.view as grok

Copied: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/more_templates/moretemplate.pt (from rev 120216, grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/view.pt)
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/more_templates/moretemplate.pt	                        (rev 0)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/more_templates/moretemplate.pt	2011-02-28 12:40:03 UTC (rev 120595)
@@ -0,0 +1 @@
+<p>View template</p>

Modified: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub.py	2011-02-28 12:09:34 UTC (rev 120594)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub.py	2011-02-28 12:40:03 UTC (rev 120595)
@@ -1,6 +1,8 @@
-
+import grokcore.view as grok
 from grokcore.view.tests.view.cross_package_fixture.zbase import BaseView
 
 class SubView(BaseView):
     pass
 
+class SubViewOverrideTemplate(BaseView):
+    grok.template('subtemplate')
\ No newline at end of file

Copied: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub_templates/subtemplate.pt (from rev 120216, grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/view.pt)
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub_templates/subtemplate.pt	                        (rev 0)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub_templates/subtemplate.pt	2011-02-28 12:40:03 UTC (rev 120595)
@@ -0,0 +1 @@
+<p>View template</p>

Copied: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/subtemplatedir.py (from rev 120216, grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/sub.py)
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/subtemplatedir.py	                        (rev 0)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/subpackage/subtemplatedir.py	2011-02-28 12:40:03 UTC (rev 120595)
@@ -0,0 +1,10 @@
+import grokcore.view as grok
+from grokcore.view.tests.view.cross_package_fixture.zbase import BaseView
+
+grok.templatedir('more_templates')
+
+class MoreSubView(BaseView):
+    pass
+
+class MoreSubViewOverrideTemplate(BaseView):
+    grok.template('moretemplate')
\ No newline at end of file

Modified: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase.py	2011-02-28 12:09:34 UTC (rev 120594)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase.py	2011-02-28 12:40:03 UTC (rev 120595)
@@ -1,8 +1,5 @@
-#
-
 import grokcore.view as grok
 
 class BaseView(grok.View):
-    grok.template('view')
+    grok.template('basetemplate')
     grok.context(object)
-

Copied: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/basetemplate.pt (from rev 120216, grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/view.pt)
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/basetemplate.pt	                        (rev 0)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/basetemplate.pt	2011-02-28 12:40:03 UTC (rev 120595)
@@ -0,0 +1 @@
+<p>View template</p>

Deleted: grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/view.pt
===================================================================
--- grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/view.pt	2011-02-28 12:09:34 UTC (rev 120594)
+++ grokcore.view/trunk/src/grokcore/view/tests/view/cross_package_fixture/zbase_templates/view.pt	2011-02-28 12:40:03 UTC (rev 120595)
@@ -1 +0,0 @@
-<p>View template</p>