[Checkins] SVN: grokui.admin/branches/fancy-layout/ Removed useless imports and useless dependencies.

Souheil CHELFOUH souheil at chelfouh.com
Thu Jan 7 18:54:25 EST 2010


Log message for revision 107789:
  Removed useless imports and useless dependencies.
  Now, the grokui is useable with its layer but...
  We still need a way to shift it off :)
  

Changed:
  U   grokui.admin/branches/fancy-layout/buildout.cfg
  U   grokui.admin/branches/fancy-layout/setup.py
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/security.py
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/server.py
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/tests/events.py
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/utilities.py
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/view.py

-=-
Modified: grokui.admin/branches/fancy-layout/buildout.cfg
===================================================================
--- grokui.admin/branches/fancy-layout/buildout.cfg	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/buildout.cfg	2010-01-07 23:54:25 UTC (rev 107789)
@@ -2,8 +2,7 @@
 develop = .
 parts = svn test data zopectl app 
 find-links = http://download.zope.org/distribution/
-# Test also with other configs...
-extends = http://grok.zope.org/releaseinfo/grok-1.0b2.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.1a2.cfg
 versions = versions
 
 [data]
@@ -17,7 +16,7 @@
 [versions]
 grokui.admin = 
 grokui.base = 
-megrok.layout = 0.8
+megrok.layout = 0.9
 
 [app]
 recipe = zc.zope3recipes>=0.5.3:application
@@ -52,10 +51,10 @@
             <!-- Replace the following directive if you don't want
                  public access -->
             <grant permission="zope.View"
-                   principal="zope.Anybody" />
+                   principal="zope.Everybody" />
 
             <grant permission="zope.app.dublincore.view"
-                   principal="zope.Anybody" />
+                   principal="zope.Everybody" />
 
             <role id="zope.Manager" title="Site Manager" />
             <role id="zope.Member" title="Site Member" />
@@ -72,5 +71,5 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = grokui.admin [test,]
+eggs = grokui.admin [test]
 defaults = ['--tests-pattern', '^f?tests$', '-v']

Modified: grokui.admin/branches/fancy-layout/setup.py
===================================================================
--- grokui.admin/branches/fancy-layout/setup.py	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/setup.py	2010-01-07 23:54:25 UTC (rev 107789)
@@ -2,7 +2,11 @@
 from setuptools import setup, find_packages
 
 tests_require = [
-    'z3c.testsetup',
+    'zope.app.testing',
+    'zope.testbrowser',
+    'zope.testing',
+    'zope.security',
+    'zope.securitypolicy'
     ]
 
 def read(*rnames):
@@ -37,27 +41,23 @@
       include_package_data=True,
       zip_safe=False,
       namespace_packages = ['grokui'],
-      install_requires=['setuptools',
-                        'ZODB3',
-                        'grok',
-                        'grokui.base',
-			'grokcore.view',
-                        'martian',
-                        'z3c.flashmessage',
-                        'zope.app.applicationcontrol',
-                        'zope.app.appsetup',
-                        'zope.app.folder',
-                        'zope.app.preference',
-                        'zope.app.security',
-                        'zope.app.testing',
-                        'zope.component',
-                        'zope.exceptions',
-                        'zope.interface',
-                        'zope.schema',
-                        'zope.security',
-                        'zope.testbrowser',
-                        'zope.testing',
-                        ],
+      install_requires=[
+          'ZODB3',
+          'grok',
+          'grokui.base',
+          'setuptools',
+          'z3c.flashmessage',
+          'zope.annotation',
+          'zope.app.applicationcontrol',
+          'zope.app.appsetup',
+          'zope.component',
+          'zope.contentprovider',
+          'zope.exceptions',
+          'zope.interface',
+          'zope.schema',
+          'zope.site',
+          'zope.traversing',
+          ],
       tests_require = tests_require,
       extras_require = dict(test=tests_require),
       entry_points="""

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py	2010-01-07 23:54:25 UTC (rev 107789)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import grok
 from ZODB.broken import Broken
 from zope.traversing.browser import absoluteURL
@@ -5,7 +7,6 @@
 from zope.component import getMultiAdapter, getAllUtilitiesRegisteredFor
 from grokui.base.layout import AdminView
 from grokui.base.namespace import GrokUILayer
-from grokui.base.contentproviders import ApplicationInformation
 from grokui.base.interfaces import IInstallableApplication, \
                                    IInstalledApplication, \
                                    IApplicationRepresentation
@@ -14,6 +15,7 @@
 grok.templatedir("templates")
 
 
+from zope.annotation import IAnnotations
 class InstalledApplication(object):
     """
     """
@@ -21,7 +23,11 @@
    
     def __init__(self, obj, request):
         self.__name__ = obj.__name__
-        self.url = absoluteURL(obj, request).replace('/++grokui++', '')
+        grokui_info = IAnnotations(request).get('grokui')
+        if not grokui_info:
+            self.url = absoluteURL(obj, request)
+        else:
+            self.url = grokui_info.get('root_url')
         self.description = obj.__doc__
         self.__parent__ = obj.__parent__
         self.classname = ".".join((obj.__class__.__module__,

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml	2010-01-07 23:54:25 UTC (rev 107789)
@@ -1,7 +1,5 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:grok="http://namespaces.zope.org/grok">
   <include package="grok" />
-  <include package="zope.app.preference" file="meta.zcml"/>
-  <includeDependencies package="." />
   <grok:grok package="." />
 </configure>

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/security.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/security.py	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/security.py	2010-01-07 23:54:25 UTC (rev 107789)
@@ -11,7 +11,7 @@
 from persistent import Persistent
 from zope.component import adapter, provideHandler
 from zope.app.appsetup.interfaces import IDatabaseOpenedWithRootEvent
-from zope.app.folder.interfaces import IRootFolder
+from zope.site.interfaces import IRootFolder
 from grokui.admin.interfaces import ISecurityNotifier
 from grokui.admin.utilities import getVersion, TimeoutableHTTPHandler
 

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/server.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/server.py	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/server.py	2010-01-07 23:54:25 UTC (rev 107789)
@@ -5,14 +5,12 @@
 
 from grokui.base.layout import AdminView
 from grokui.admin.interfaces import ISecurityNotifier
-from grokui.admin.utilities import getVersion, getURLWithParams
+from grokui.admin.utilities import getVersion
 
 from ZODB.interfaces import IDatabase
 from ZODB.FileStorage.FileStorage import FileStorageError
 
 import zope.component
-from zope.interface import Interface
-from zope.traversing.browser import absoluteURL
 from zope.app.applicationcontrol.interfaces import IServerControl
 from zope.app.applicationcontrol.browser.runtimeinfo import RuntimeInfoView
 from zope.app.applicationcontrol.browser.zodbcontrol import ZODBControlView

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/tests/events.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/tests/events.py	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/tests/events.py	2010-01-07 23:54:25 UTC (rev 107789)
@@ -36,7 +36,6 @@
 
 """
 import grok
-from zope.component import interfaces
 
 class App(grok.Application, grok.Container):
     pass

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/utilities.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/utilities.py	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/utilities.py	2010-01-07 23:54:25 UTC (rev 107789)
@@ -1,11 +1,8 @@
 import httplib
 import pkg_resources
-import re
 import socket
 import urllib
 import urllib2
-from zope.tal.taldefs import attrEscape
-from urlparse import urlparse, urlunparse
 
 
 def getURLWithParams(url, data=None):

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/view.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/view.py	2010-01-07 22:44:15 UTC (rev 107788)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/view.py	2010-01-07 23:54:25 UTC (rev 107789)
@@ -1,48 +1,20 @@
-##############################################################################
-#
-# Copyright (c) 2007-2008 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
 """Views for the grok admin UI"""
 
 import grok
-import z3c.flashmessage.interfaces
+import zope.component
 
+from BTrees.OOBTree import OOBTree
 from grokui.admin.interfaces import ISecurityNotifier
 from grokui.admin.utilities import getVersion, getURLWithParams
 
-from ZODB.broken import Broken
-from ZODB.interfaces import IDatabase
-from BTrees.OOBTree import OOBTree
-
-import zope.component
-from zope.interface import Interface
-from zope.traversing.browser import absoluteURL
-from zope.app.applicationcontrol.interfaces import IServerControl
-from zope.app.applicationcontrol.applicationcontrol import applicationController
-from zope.app.applicationcontrol.browser.runtimeinfo import RuntimeInfoView
-from zope.app.applicationcontrol.browser.zodbcontrol import ZODBControlView
-from zope.app.folder.interfaces import IRootFolder
+from zope.site.interfaces import IRootFolder
 from zope.exceptions import DuplicationError
-from ZODB.FileStorage.FileStorage import FileStorageError
-from zope.contentprovider.interfaces import IContentProvider
-
-from grokui.base.layout import AdminView
-from grokui.base.interfaces import IInstallableApplication, IInstalledApplication, IApplicationRepresentation
   
 grok.context(IRootFolder)
 grok.templatedir("templates")
 
 
-
 class ManageApplications(grok.Permission):
     grok.name('grok.ManageApplications')
 



More information about the checkins mailing list