[Checkins] SVN: megrok.z3ctable/trunk/s Update to use grokcore.layout instead of megrok.layout.

[Sylvain Viollon]

Log message for revision 124097:
  Update to use grokcore.layout instead of megrok.layout.
  

Changed:
  U   megrok.z3ctable/trunk/setup.py
  U   megrok.z3ctable/trunk/src/megrok/z3ctable/components.py
  U   megrok.z3ctable/trunk/src/megrok/z3ctable/configure.zcml
  U   megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py

-=-
Modified: megrok.z3ctable/trunk/setup.py
===================================================================
--- megrok.z3ctable/trunk/setup.py	2012-01-20 11:23:16 UTC (rev 124096)
+++ megrok.z3ctable/trunk/setup.py	2012-01-20 13:18:55 UTC (rev 124097)
@@ -39,8 +39,8 @@
       include_package_data=True,
       zip_safe=False,
       install_requires=[
-	  'grokcore.component',
-	  'megrok.layout >= 0.9',
+          'grokcore.component',
+          'grokcore.layout',
           'grokcore.view >= 1.12',
           'martian',
           'setuptools',

Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/components.py
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/components.py	2012-01-20 11:23:16 UTC (rev 124096)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/components.py	2012-01-20 13:18:55 UTC (rev 124097)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import megrok.layout
+import grokcore.layout as layout
 import grokcore.view as view
 import grokcore.component as grok
 from z3c.table import table, column, interfaces
@@ -29,13 +29,13 @@
     render.base_method = True
 
 
-class TablePage(megrok.layout.Page, Table):
+class TablePage(layout.Page, Table):
     """A Page that renders a Table.
     """
     grok.baseclass()
 
     def __init__(self, context, request):
-        megrok.layout.Page.__init__(self, context, request)
+        layout.Page.__init__(self, context, request)
         Table.__init__(self, context, request)
 
     def update(self):

Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/configure.zcml
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/configure.zcml	2012-01-20 11:23:16 UTC (rev 124096)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/configure.zcml	2012-01-20 13:18:55 UTC (rev 124097)
@@ -1,3 +1,5 @@
 <configure xmlns="http://namespaces.zope.org/zope">
   <include package="z3c.table" />
+  <include package="grokcore.layout" />
+  <include package="grokcore.view" />
 </configure>

Modified: megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py
===================================================================
--- megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py	2012-01-20 11:23:16 UTC (rev 124096)
+++ megrok.z3ctable/trunk/src/megrok/z3ctable/tests/views.py	2012-01-20 13:18:55 UTC (rev 124097)
@@ -136,9 +136,9 @@
 """
 
 import grokcore.component as grok
+from grokcore.layout import Layout
 from zope.interface import Interface
 from megrok.z3ctable.tests import Container
-from megrok.layout import Layout
 from megrok.z3ctable import (TableView, table, 
                              GetAttrColumn, NameColumn, TablePage)