[Checkins] SVN: grokcore.view/trunk/src/grokcore/view/ Merged the branch 1.13, that moved the directive 'view' from grokcore.viewlet to here.

[Souheil CHELFOUH]

Log message for revision 118059:
  Merged the branch 1.13, that moved the directive 'view' from grokcore.viewlet to here.
  

Changed:
  U   grokcore.view/trunk/src/grokcore/view/__init__.py
  U   grokcore.view/trunk/src/grokcore/view/directive.py
  U   grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py
  U   grokcore.view/trunk/src/grokcore/view/interfaces.py

-=-
Modified: grokcore.view/trunk/src/grokcore/view/__init__.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/__init__.py	2010-11-01 15:54:31 UTC (rev 118058)
+++ grokcore.view/trunk/src/grokcore/view/__init__.py	2010-11-01 15:55:11 UTC (rev 118059)
@@ -22,7 +22,8 @@
 from grokcore.view.components import View, ViewSupport
 from grokcore.view.components import PageTemplate, PageTemplateFile
 from grokcore.view.components import DirectoryResource
-from grokcore.view.directive import layer, template, templatedir, skin, path
+from grokcore.view.directive import (
+    layer, template, templatedir, skin, path, view)
 from grokcore.view.util import url
 
 # Import this module so that it's available as soon as you import the

Modified: grokcore.view/trunk/src/grokcore/view/directive.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/directive.py	2010-11-01 15:54:31 UTC (rev 118058)
+++ grokcore.view/trunk/src/grokcore/view/directive.py	2010-11-01 15:55:11 UTC (rev 118059)
@@ -19,6 +19,7 @@
 from martian.error import GrokImportError
 from martian.directive import StoreOnce
 from zope.interface.interface import TAGGED_DATA
+from zope.publisher.interfaces.browser import IBrowserView
 
 
 def validateLocalPath(directive, value):
@@ -92,3 +93,6 @@
     scope = martian.CLASS
     store = martian.ONCE
     validate = martian.validateText
+
+class view(OneInterfaceOrClassOnClassOrModule):
+    default = IBrowserView

Modified: grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py	2010-11-01 15:54:31 UTC (rev 118058)
+++ grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py	2010-11-01 15:55:11 UTC (rev 118059)
@@ -1,4 +1,3 @@
-import doctest
 import re
 import unittest
 import os.path

Modified: grokcore.view/trunk/src/grokcore/view/interfaces.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/interfaces.py	2010-11-01 15:54:31 UTC (rev 118058)
+++ grokcore.view/trunk/src/grokcore/view/interfaces.py	2010-11-01 15:55:11 UTC (rev 118059)
@@ -53,7 +53,11 @@
         of the directory.  This can be overridden using
         ``templatedir``."""
 
+    def view(view):
+        """Define on which view a viewlet manager/viewlet is registered.
+        """
 
+
 class IGrokcoreViewAPI(IBaseClasses, IDirectives):
 
     def url(request, obj, name=None, data=None):