[Checkins] SVN: grokcore.view/trunk/ Work with newest Martian (0.12) now.

[Martijn Faassen]

Log message for revision 104216:
  Work with newest Martian (0.12) now.
  

Changed:
  U   grokcore.view/trunk/CHANGES.txt
  U   grokcore.view/trunk/buildout.cfg
  U   grokcore.view/trunk/setup.py
  U   grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py
  U   grokcore.view/trunk/src/grokcore/view/meta/views.py
  U   grokcore.view/trunk/src/grokcore/view/templatereg.py

-=-
Modified: grokcore.view/trunk/CHANGES.txt
===================================================================
--- grokcore.view/trunk/CHANGES.txt	2009-09-17 13:59:03 UTC (rev 104215)
+++ grokcore.view/trunk/CHANGES.txt	2009-09-17 14:01:28 UTC (rev 104216)
@@ -1,11 +1,12 @@
 Changes
 =======
 
-1.13 (unreleased)
------------------
+2.0 (unreleased)
+----------------
 
-- Bugfix: support windows paths.
+- Works with new Martian (0.12) and grokcore.component 2.0.
 
+- Test fix: support windows paths.
 
 1.12.1 (2009-09-17)
 -------------------

Modified: grokcore.view/trunk/buildout.cfg
===================================================================
--- grokcore.view/trunk/buildout.cfg	2009-09-17 13:59:03 UTC (rev 104215)
+++ grokcore.view/trunk/buildout.cfg	2009-09-17 14:01:28 UTC (rev 104216)
@@ -10,12 +10,10 @@
 
 [versions]
 grokcore.view = 
-docutils = 0.5
-setuptools = 0.6c9
-zc.buildout = 1.4.1
-zc.recipe.egg = 1.2.2
+martian = 0.12
+grokcore.component = 2.0
+grokcore.security = 1.3
 
-
 [interpreter]
 recipe = zc.recipe.egg
 eggs = grokcore.view

Modified: grokcore.view/trunk/setup.py
===================================================================
--- grokcore.view/trunk/setup.py	2009-09-17 13:59:03 UTC (rev 104215)
+++ grokcore.view/trunk/setup.py	2009-09-17 14:01:28 UTC (rev 104216)
@@ -12,7 +12,7 @@
 
 setup(
     name='grokcore.view',
-    version = '1.13dev',
+    version = '2.0dev',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',
@@ -33,9 +33,9 @@
     include_package_data = True,
     zip_safe=False,
     install_requires=['setuptools',
-                      'martian >= 0.10',
-                      'grokcore.component >= 1.5',
-                      'grokcore.security >= 1.2',
+                      'martian >= 0.12',
+                      'grokcore.component >= 2.0',
+                      'grokcore.security >= 1.3',
                       'zope.schema',
                       'zope.security',
                       'zope.traversing',

Modified: grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py	2009-09-17 13:59:03 UTC (rev 104215)
+++ grokcore.view/trunk/src/grokcore/view/ftests/view/macros.py	2009-09-17 14:01:28 UTC (rev 104216)
@@ -75,6 +75,8 @@
 """
 import grokcore.view as grok
 
+grok.templatedir('macros_templates')
+
 class Mammoth(grok.Context):
     pass
 

Modified: grokcore.view/trunk/src/grokcore/view/meta/views.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/meta/views.py	2009-09-17 13:59:03 UTC (rev 104215)
+++ grokcore.view/trunk/src/grokcore/view/meta/views.py	2009-09-17 14:01:28 UTC (rev 104216)
@@ -35,7 +35,8 @@
 
 class ViewGrokker(martian.ClassGrokker):
     martian.component(components.View)
-    martian.directive(grokcore.component.context)
+    martian.directive(grokcore.component.context,
+                      get_default=grokcore.component.meta.default_context)
     martian.directive(grokcore.view.layer, default=IDefaultBrowserLayer)
     martian.directive(grokcore.component.name, get_default=default_view_name)
 

Modified: grokcore.view/trunk/src/grokcore/view/templatereg.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/templatereg.py	2009-09-17 13:59:03 UTC (rev 104215)
+++ grokcore.view/trunk/src/grokcore/view/templatereg.py	2009-09-17 14:01:28 UTC (rev 104216)
@@ -26,7 +26,7 @@
 
     def findFilesystem(self, module_info):
         template_dir_name = grokcore.view.templatedir.bind().get(
-            module=module_info.getModule())
+            module_info.getModule())
         if template_dir_name is None:
             template_dir_name = module_info.name + '_templates'