[Checkins] SVN: zope.browserpage/trunk/src/zope/browserpage/ No longer pass the deprecated 'layer' agrument to z.c.registerAdapter.

[Tres Seaver]

Log message for revision 127196:
  No longer pass the deprecated 'layer' agrument to z.c.registerAdapter.
  
  Instead, pass (for_, layer) as expected.

Changed:
  U   zope.browserpage/trunk/src/zope/browserpage/metaconfigure.py
  U   zope.browserpage/trunk/src/zope/browserpage/metadirectives.py
  U   zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py

-=-
Modified: zope.browserpage/trunk/src/zope/browserpage/metaconfigure.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/metaconfigure.py	2012-06-29 15:37:01 UTC (rev 127195)
+++ zope.browserpage/trunk/src/zope/browserpage/metaconfigure.py	2012-06-29 16:27:13 UTC (rev 127196)
@@ -161,7 +161,7 @@
     defineChecker(new_class, Checker(required))
 
     _context.action(
-        discriminator = ('view', for_, name, IBrowserRequest, layer),
+        discriminator = ('view', (for_, layer), name, IBrowserRequest),
         callable = handler,
         args = ('registerAdapter',
                 new_class, (for_, layer), Interface, name, _context.info),
@@ -216,7 +216,7 @@
 
         permission = _handle_permission(_context, permission)
 
-        self.args = (_context, name, for_, permission, layer, class_,
+        self.args = (_context, name, (for_, layer), permission, class_,
                      allowed_interface, allowed_attributes)
 
         self.pages = []
@@ -241,7 +241,7 @@
         return ()
 
     def __call__(self):
-        (_context, name, for_, permission, layer, class_,
+        (_context, name, (for_, layer), permission, class_,
          allowed_interface, allowed_attributes) = self.args
 
         required = {}

Modified: zope.browserpage/trunk/src/zope/browserpage/metadirectives.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/metadirectives.py	2012-06-29 15:37:01 UTC (rev 127195)
+++ zope.browserpage/trunk/src/zope/browserpage/metadirectives.py	2012-06-29 16:27:13 UTC (rev 127196)
@@ -41,6 +41,13 @@
         required=False
         )
 
+    layer = GlobalObject(
+        title=u"The request interface or class this view is for.",
+        description=
+        u"Defaults to zope.publisher.interfaces.browser.IDefaultBrowserLayer.",
+        required=False
+        )
+
     permission = Permission(
         title=u"Permission",
         description=u"The permission needed to use the view.",

Modified: zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py	2012-06-29 15:37:01 UTC (rev 127195)
+++ zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py	2012-06-29 16:27:13 UTC (rev 127196)
@@ -266,9 +266,8 @@
             '''
             <browser:page name="test"
                 class="zope.component.testfiles.views.VZMI"
-                layer="
-                  zope.browserpage.tests.test_page.ITestLayer"
                 for="zope.component.testfiles.views.IC"
+                layer="zope.browserpage.tests.test_page.ITestLayer"
                 permission="zope.Public"
                 attribute="index"
                 />
@@ -713,18 +712,17 @@
         xmlconfig(StringIO(template %
             '''
             <browser:pages
-                for="*"
                 class="zope.component.testfiles.views.V1"
+                for="*"
                 permission="zope.Public"
                 >
               <browser:page name="index.html" attribute="index" />
             </browser:pages>
 
             <browser:pages
-                for="*"
                 class="zope.component.testfiles.views.V1"
-                layer="
-                  zope.browserpage.tests.test_page.ITestLayer"
+                for="*"
+                layer="zope.browserpage.tests.test_page.ITestLayer"
                 permission="zope.Public"
                 >
               <browser:page name="index.html" attribute="action" />