[Checkins] SVN: grokui.base/trunk/s Cleaned dependencies.

[Souheil CHELFOUH]

Log message for revision 108463:
  Cleaned dependencies.
  

Changed:
  U   grokui.base/trunk/setup.py
  U   grokui.base/trunk/src/grokui/base/contentproviders.py
  U   grokui.base/trunk/src/grokui/base/layout.py
  U   grokui.base/trunk/src/grokui/base/messages.py
  U   grokui.base/trunk/src/grokui/base/namespace.py
  D   grokui.base/trunk/src/grokui/base/templates/adminlayout.pt
  A   grokui.base/trunk/src/grokui/base/templates/grokuilayout.pt

-=-
Modified: grokui.base/trunk/setup.py
===================================================================
--- grokui.base/trunk/setup.py	2010-01-25 09:46:01 UTC (rev 108462)
+++ grokui.base/trunk/setup.py	2010-01-25 09:51:54 UTC (rev 108463)
@@ -3,6 +3,10 @@
 
 tests_require = [
     'z3c.testsetup',
+    'zope.app.testing',
+    'zope.security',
+    'zope.testbrowser',
+    'zope.securitypolicy'
     ]
 
 def read(*rnames):
@@ -39,24 +43,21 @@
       include_package_data=True,
       zip_safe=False,
       namespace_packages = ['grokui'],
-      install_requires=['setuptools',
-                        'ZODB3',
-                        'grok',
-			'grokcore.view',
-                        'megrok.layout',
-                        'megrok.menu',
-                        'martian',
-                        'z3c.flashmessage',
-                        'zope.app.testing',
-                        'zope.component',
-                        'zope.exceptions',
-                        'zope.interface',
-                        'zope.schema',
-                        'zope.security',
-                        'zope.testbrowser',
-                        'zope.testing',
-                        'zope.site',
-                        ],
+      install_requires=[
+          'grok',
+          'megrok.layout',
+          'megrok.menu',
+          'z3c.flashmessage',
+          'zope.authentication',
+          'zope.browsermenu',
+          'zope.component',
+          'zope.interface',
+          'zope.location',
+          'zope.publisher',
+          'zope.site',
+          'zope.traversing',
+          'setuptools',
+          ],
       tests_require = tests_require,
       extras_require = dict(test=tests_require),
       entry_points="""

Modified: grokui.base/trunk/src/grokui/base/contentproviders.py
===================================================================
--- grokui.base/trunk/src/grokui/base/contentproviders.py	2010-01-25 09:46:01 UTC (rev 108462)
+++ grokui.base/trunk/src/grokui/base/contentproviders.py	2010-01-25 09:51:54 UTC (rev 108463)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import grokcore.viewlet as grok
+import grok
 from megrok.menu import Menu
 from grokui.base import IGrokUIRealm, GrokUILayer
 

Modified: grokui.base/trunk/src/grokui/base/layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/layout.py	2010-01-25 09:46:01 UTC (rev 108462)
+++ grokui.base/trunk/src/grokui/base/layout.py	2010-01-25 09:51:54 UTC (rev 108463)
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
+import grok
 import megrok.menu
-import grokcore.view as grok
 from megrok.layout import Layout, Page
 from grokui.base import IGrokUIRealm, GrokUILayer, IUIPanel, MainMenu
 

Modified: grokui.base/trunk/src/grokui/base/messages.py
===================================================================
--- grokui.base/trunk/src/grokui/base/messages.py	2010-01-25 09:46:01 UTC (rev 108462)
+++ grokui.base/trunk/src/grokui/base/messages.py	2010-01-25 09:51:54 UTC (rev 108463)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import grokcore.component as grok
+import grok
 from z3c.flashmessage.message import PersistentMessage
 from z3c.flashmessage.sources import SessionMessageSource
 from z3c.flashmessage.receiver import GlobalMessageReceiver

Modified: grokui.base/trunk/src/grokui/base/namespace.py
===================================================================
--- grokui.base/trunk/src/grokui/base/namespace.py	2010-01-25 09:46:01 UTC (rev 108462)
+++ grokui.base/trunk/src/grokui/base/namespace.py	2010-01-25 09:51:54 UTC (rev 108463)
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Components to keep Grok UI related stuff in a dedicated namespace.
 """
-import grokcore.view as grok
+import grok
 from zope.site.interfaces import IRootFolder
 from zope.location import LocationProxy
 from zope.publisher.browser import applySkin

Deleted: grokui.base/trunk/src/grokui/base/templates/adminlayout.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/adminlayout.pt	2010-01-25 09:46:01 UTC (rev 108462)
+++ grokui.base/trunk/src/grokui/base/templates/adminlayout.pt	2010-01-25 09:51:54 UTC (rev 108463)
@@ -1,17 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" i18n:domain="zope">
-  <head>
-    <title tal:content="layout/title" />
-    <link rel="stylesheet" type="text/css" 
-	  tal:attributes="href static/grok.css" />
-  </head>
-  <body>
-    <div id="grokui-header"
-	 tal:content="structure provider:grokui_admin_header" />
-
-    <div id="grokui-content"
-	 tal:content="structure view/content" />
-
-    <div id="grokui-footer"
-	 tal:content="structure provider:grokui_admin_footer" />
-  </body>
-</html>

Copied: grokui.base/trunk/src/grokui/base/templates/grokuilayout.pt (from rev 108462, grokui.base/trunk/src/grokui/base/templates/adminlayout.pt)
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/grokuilayout.pt	                        (rev 0)
+++ grokui.base/trunk/src/grokui/base/templates/grokuilayout.pt	2010-01-25 09:51:54 UTC (rev 108463)
@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml" i18n:domain="zope">
+  <head>
+    <title tal:content="layout/title" />
+    <link rel="stylesheet" type="text/css" 
+	  tal:attributes="href static/grok.css" />
+  </head>
+  <body>
+    <div id="grokui-header"
+	 tal:content="structure provider:grokui_admin_header" />
+
+    <div id="grokui-content"
+	 tal:content="structure view/content" />
+
+    <div id="grokui-footer"
+	 tal:content="structure provider:grokui_admin_footer" />
+  </body>
+</html>