[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/browser/metaconfigure.py - fixed compatibility with zope.browserpage 4.0.0

[Yvo Schubbe]

Log message for revision 127275:
  - fixed compatibility with zope.browserpage 4.0.0

Changed:
  U   Zope/trunk/src/Products/Five/browser/metaconfigure.py

-=-
Modified: Zope/trunk/src/Products/Five/browser/metaconfigure.py
===================================================================
--- Zope/trunk/src/Products/Five/browser/metaconfigure.py	2012-07-05 16:29:17 UTC (rev 127274)
+++ Zope/trunk/src/Products/Five/browser/metaconfigure.py	2012-07-05 16:36:24 UTC (rev 127275)
@@ -131,7 +131,7 @@
     _handle_for(_context, for_)
 
     _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),
@@ -196,7 +196,7 @@
 class view(zope.browserpage.metaconfigure.view):
 
     def __call__(self):
-        (_context, name, for_, permission, layer, class_,
+        (_context, name, (for_, layer), permission, class_,
          allowed_interface, allowed_attributes) = self.args
 
         required = {}
@@ -284,8 +284,7 @@
                 )
 
         _context.action(
-            discriminator = ('view', for_, name, IBrowserRequest, layer,
-                             self.provides),
+            discriminator = ('view', (for_, layer), name, self.provides),
             callable = handler,
             args = ('registerAdapter',
                     newclass, (for_, layer), self.provides, name,