[Checkins] SVN: z3ext.layout/trunk/ Register layout for (view, for, layer), instead of view and for separatly

[Nikolay Kim]

Log message for revision 94608:
  Register layout for (view, for, layer), instead of view and for separatly

Changed:
  U   z3ext.layout/trunk/CHANGES.txt
  U   z3ext.layout/trunk/setup.py
  U   z3ext.layout/trunk/src/z3ext/layout/zcml.py

-=-
Modified: z3ext.layout/trunk/CHANGES.txt
===================================================================
--- z3ext.layout/trunk/CHANGES.txt	2009-01-07 21:45:08 UTC (rev 94607)
+++ z3ext.layout/trunk/CHANGES.txt	2009-01-08 07:24:47 UTC (rev 94608)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+2.0.2 (2009-01-08)
+------------------
+
+- Register layout for (view, for, layer), instead of view and for separatly
+
+
 2.0.1 (2008-12-25)
 ------------------
 

Modified: z3ext.layout/trunk/setup.py
===================================================================
--- z3ext.layout/trunk/setup.py	2009-01-07 21:45:08 UTC (rev 94607)
+++ z3ext.layout/trunk/setup.py	2009-01-08 07:24:47 UTC (rev 94608)
@@ -21,7 +21,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version='2.0.2dev'
+version='2.0.2'
 
 
 setup(name='z3ext.layout',

Modified: z3ext.layout/trunk/src/z3ext/layout/zcml.py
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/zcml.py	2009-01-07 21:45:08 UTC (rev 94607)
+++ z3ext.layout/trunk/src/z3ext/layout/zcml.py	2009-01-08 07:24:47 UTC (rev 94608)
@@ -256,41 +256,23 @@
     # security checker
     defineChecker(newclass, Checker(required))
 
-    if for_ is not None:
-        # register the template
-        if name:
-            adapter(_context, (newclass,),
-                    provides, (interface.Interface, for_, layer), name=name)
-        else:
-            adapter(_context, (newclass,),
-                    provides, (interface.Interface, for_, layer))
+    # register the template
+    if name:
+        adapter(_context, (newclass,),
+                provides, (view, for_, layer), name=name)
+    else:
+        adapter(_context, (newclass,),
+                provides, (view, for_, layer))
 
-        # send ILayoutCreatedEvent event
-        if uid:
-            _context.action(
-                discriminator = ('z3ext.layout', uid),
-                callable = sendNotification,
-                args = (uid, name, interface.Interface, for_, layer, newclass, kwargs),
-                order = 99999999)
+    # send ILayoutCreatedEvent event
+    if uid:
+        _context.action(
+            discriminator = ('z3ext.layout', uid),
+            callable = sendNotification,
+            args = (uid, name, view, for_, layer, newclass, kwargs),
+            order = 99999999)
 
-    if view is not None:
-        # register the template
-        if name:
-            adapter(_context, (newclass,),
-                    provides, (view, interface.Interface, layer), name=name)
-        else:
-            adapter(_context, (newclass,),
-                    provides, (view, interface.Interface, layer))
 
-        # send ILayoutCreatedEvent event
-        if uid:
-            _context.action(
-                discriminator = ('z3ext.layout', uid),
-                callable = sendNotification,
-                args = (uid, name, view, interface.Interface, layer, newclass, kwargs),
-                order = 99999999)
-
-
 class LayoutCreatedEvent(object):
     interface.implements(ILayoutCreatedEvent)