[Checkins] SVN: megrok.layout/trunk/src/megrok/layout/ Switched form context/request to request/context

[Souheil CHELFOUH]

Log message for revision 117646:
  Switched form context/request to request/context

Changed:
  U   megrok.layout/trunk/src/megrok/layout/README.txt
  U   megrok.layout/trunk/src/megrok/layout/components.py
  U   megrok.layout/trunk/src/megrok/layout/ftests/test_layout.py
  U   megrok.layout/trunk/src/megrok/layout/ftests/test_page.py
  U   megrok.layout/trunk/src/megrok/layout/ftests/test_static.py
  U   megrok.layout/trunk/src/megrok/layout/meta.py
  U   megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.py

-=-
Modified: megrok.layout/trunk/src/megrok/layout/README.txt
===================================================================
--- megrok.layout/trunk/src/megrok/layout/README.txt	2010-10-18 09:57:46 UTC (rev 117645)
+++ megrok.layout/trunk/src/megrok/layout/README.txt	2010-10-18 09:57:52 UTC (rev 117646)
@@ -50,7 +50,7 @@
   >>> from zope.component import getMultiAdapter
   >>> from zope.publisher.browser import TestRequest
 
-  >>> layout = getMultiAdapter((Interface, TestRequest()), ILayout)
+  >>> layout = getMultiAdapter((TestRequest(), Interface), ILayout)
   >>> isinstance(layout, MyLayout)
   True
   >>> layout.render()

Modified: megrok.layout/trunk/src/megrok/layout/components.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/components.py	2010-10-18 09:57:46 UTC (rev 117645)
+++ megrok.layout/trunk/src/megrok/layout/components.py	2010-10-18 09:57:52 UTC (rev 117646)
@@ -15,7 +15,7 @@
     grok.baseclass()
     grok.implements(ILayout)
 
-    def __init__(self, context, request):
+    def __init__(self, request, context):
         self.context = context
         self.request = request
         self.view = None
@@ -97,7 +97,7 @@
             # continue rendering the template or doing anything else.
             return
         self.layout = zope.component.getMultiAdapter(
-            (self.context, self.request), ILayout)
+            (self.request, self.context), ILayout)
         return self.layout(self)
 
 
@@ -136,5 +136,5 @@
             return
         
         self.layout = zope.component.getMultiAdapter(
-            (self.context, self.request), ILayout)
+            (self.request, self.context), ILayout)
         return self.layout(self)

Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_layout.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_layout.py	2010-10-18 09:57:46 UTC (rev 117645)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_layout.py	2010-10-18 09:57:52 UTC (rev 117646)
@@ -4,7 +4,7 @@
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()
   >>> mammoth = Mammoth()
-  >>> mylayout = getMultiAdapter((mammoth, request), ILayout)
+  >>> mylayout = getMultiAdapter((request, mammoth), ILayout)
   >>> ILayout.providedBy(mylayout)
   True
 
@@ -15,7 +15,7 @@
   '<div> MyLayout </div>'
 
   >>> elephant = Elephant()
-  >>> mycontextlayout = getMultiAdapter((elephant, request), ILayout)
+  >>> mycontextlayout = getMultiAdapter((request, elephant), ILayout)
   >>> mycontextlayout.render()
   '<div> MyContextLayout </div>'
 """

Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_page.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_page.py	2010-10-18 09:57:46 UTC (rev 117645)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_page.py	2010-10-18 09:57:52 UTC (rev 117646)
@@ -4,7 +4,7 @@
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()
   >>> cow = Cow()
-  >>> mylayout = getMultiAdapter((cow, request), ILayout)
+  >>> mylayout = getMultiAdapter((request, cow), ILayout)
   >>> myview = getMultiAdapter((cow, request), name='myview')
 
 

Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_static.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_static.py	2010-10-18 09:57:46 UTC (rev 117645)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_static.py	2010-10-18 09:57:52 UTC (rev 117646)
@@ -4,7 +4,7 @@
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()
   >>> mongo = Dummy()
-  >>> mylayout = getMultiAdapter((mongo, request), ILayout)
+  >>> mylayout = getMultiAdapter((request, mongo), ILayout)
   >>> mylayout.static
   <grokcore.view.components.DirectoryResource object at ...>
   >>> mylayout.static['empty.js']

Modified: megrok.layout/trunk/src/megrok/layout/meta.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/meta.py	2010-10-18 09:57:46 UTC (rev 117645)
+++ megrok.layout/trunk/src/megrok/layout/meta.py	2010-10-18 09:57:52 UTC (rev 117646)
@@ -27,7 +27,7 @@
                 args=(templates, factory.module_info, factory)
                 )
 
-        adapts = (context, layer)
+        adapts = (layer, context)
         config.action(
             discriminator=('adapter', adapts, ILayout),
             callable=zope.component.provideAdapter,

Modified: megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.py	2010-10-18 09:57:46 UTC (rev 117645)
+++ megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.py	2010-10-18 09:57:52 UTC (rev 117646)
@@ -3,7 +3,7 @@
   Traceback (most recent call last):
   ...
   ConfigurationConflictError: Conflicting configuration actions
-        For: ('adapter', (<InterfaceClass zope.interface.Interface>, <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>), <InterfaceClass megrok.layout.interfaces.ILayout>)
+     For: ('adapter', (<InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>, <InterfaceClass zope.interface.Interface>), <InterfaceClass megrok.layout.interfaces.ILayout>)
 """
 
 import grokcore.component as grok