[Checkins] SVN: grokui.admin/branches/introspectorless/ Removed unused dependencies and imports
Souheil CHELFOUH
souheil at chelfouh.com
Tue Sep 15 06:35:34 EDT 2009
Log message for revision 104034:
Removed unused dependencies and imports
Changed:
U grokui.admin/branches/introspectorless/README.txt
U grokui.admin/branches/introspectorless/setup.py
U grokui.admin/branches/introspectorless/src/grokui/admin/security.py
U grokui.admin/branches/introspectorless/src/grokui/admin/view.py
-=-
Modified: grokui.admin/branches/introspectorless/README.txt
===================================================================
--- grokui.admin/branches/introspectorless/README.txt 2009-09-15 10:34:27 UTC (rev 104033)
+++ grokui.admin/branches/introspectorless/README.txt 2009-09-15 10:35:33 UTC (rev 104034)
@@ -1,2 +1 @@
see src/grokui.admin/README.txt
-
Modified: grokui.admin/branches/introspectorless/setup.py
===================================================================
--- grokui.admin/branches/introspectorless/setup.py 2009-09-15 10:34:27 UTC (rev 104033)
+++ grokui.admin/branches/introspectorless/setup.py 2009-09-15 10:35:33 UTC (rev 104034)
@@ -44,7 +44,6 @@
'martian',
'z3c.flashmessage',
'zope.annotation',
- 'zope.app.apidoc',
'zope.app.applicationcontrol',
'zope.app.appsetup',
'zope.app.broken',
@@ -53,19 +52,12 @@
'zope.app.security',
'zope.app.testing',
'zope.component',
- 'zope.dottedname',
- 'zope.dublincore',
'zope.exceptions',
'zope.interface',
- 'zope.location',
- 'zope.proxy',
'zope.schema',
'zope.security',
- 'zope.tal',
'zope.testbrowser',
'zope.testing',
- 'zope.traversing',
- 'zope.app.component',
],
tests_require = tests_require,
extras_require = dict(test=tests_require),
Modified: grokui.admin/branches/introspectorless/src/grokui/admin/security.py
===================================================================
--- grokui.admin/branches/introspectorless/src/grokui/admin/security.py 2009-09-15 10:34:27 UTC (rev 104033)
+++ grokui.admin/branches/introspectorless/src/grokui/admin/security.py 2009-09-15 10:35:33 UTC (rev 104034)
@@ -7,19 +7,22 @@
import time
import urllib2
import urlparse
+
+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.component import adapter, provideHandler
-from persistent import Persistent
from grokui.admin.interfaces import ISecurityNotifier
from grokui.admin.utilities import getVersion, TimeoutableHTTPHandler
+
class SecurityScreen(grok.ViewletManager):
"""A viewlet manager that keeps security related notifications.
"""
grok.name('grokadmin_security')
grok.context(IRootFolder)
+
class SecurityNotificationViewlet(grok.Viewlet):
"""Viewlet displaying notifications from a local `SecurityNotifier`.
"""
@@ -39,6 +42,7 @@
def render(self):
return self.security_notifier.getNotification()
+
class SecurityNotifier(Persistent):
"""A security notifier.
@@ -143,6 +147,7 @@
self.last_display = time.time()
return
+
def setupSecurityNotification(site):
"""Setup a SecurityNotifier as persistent utility.
@@ -162,6 +167,7 @@
utility = site_manager['grokadmin_security']
site_manager.registerUtility(utility, ISecurityNotifier, name=u'')
return
+
@adapter(IDatabaseOpenedWithRootEvent)
def securitySetupHandler(event):
@@ -171,6 +177,7 @@
db, connection, root, root_folder = getInformationFromEvent(event)
setupSecurityNotification(root_folder)
-
+
+
# ...then install the event handler:
provideHandler(securitySetupHandler)
Modified: grokui.admin/branches/introspectorless/src/grokui/admin/view.py
===================================================================
--- grokui.admin/branches/introspectorless/src/grokui/admin/view.py 2009-09-15 10:34:27 UTC (rev 104033)
+++ grokui.admin/branches/introspectorless/src/grokui/admin/view.py 2009-09-15 10:35:33 UTC (rev 104034)
@@ -14,52 +14,44 @@
"""Views for the grok admin UI"""
import grok
-import os
-import inspect
-import time
-from urllib import urlencode
+import z3c.flashmessage.interfaces
from grokui.admin.interfaces import ISecurityNotifier
-
-from grokui.admin.security import SecurityNotifier
from grokui.admin.utilities import getVersion, getURLWithParams
from ZODB.broken import Broken
from ZODB.interfaces import IDatabase
-from BTrees.OOBTree import OOBTree
+from BTrees.OBTree import OOBTree
import zope.component
from zope.interface import Interface
-from zope.interface.interface import InterfaceClass
from zope.app.applicationcontrol.interfaces import IServerControl
from zope.app.applicationcontrol.applicationcontrol import applicationController
-from zope.app.applicationcontrol.runtimeinfo import RuntimeInfo
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.app.security.interfaces import ILogout, IAuthentication
from zope.app.security.interfaces import IUnauthenticatedPrincipal
from zope.exceptions import DuplicationError
-from zope.proxy import removeAllProxies
-from zope.tal.taldefs import attrEscape
from ZODB.FileStorage.FileStorage import FileStorageError
-import z3c.flashmessage.interfaces
try:
# For grokcore.view >= 1.9 working sets...
from grokcore.view import CodeView as GrokCoreViewOrCodeView
except ImportError:
# For grokcore.view < 1.9 working sets...
from grok import View as GrokCoreViewOrCodeView
+
grok.context(IRootFolder)
+
def flash(message, type='message'):
- src = zope.component.getUtility(z3c.flashmessage.interfaces.IMessageSource, name='session')
+ src = zope.component.getUtility(
+ z3c.flashmessage.interfaces.IMessageSource, name='session'
+ )
src.send(message, type)
-
class ManageApplications(grok.Permission):
grok.name('grok.ManageApplications')
@@ -225,7 +217,6 @@
self.redirect(self.url(self.context))
-
class Rename(AdminViewBase):
"""Rename Grok applications.
"""
@@ -343,12 +334,11 @@
class GrokAdminMacros(AdminViewBase):
- """Provides the o-wrap layout."""
-
+ """Provides the o-wrap layout.
+ """
grok.context(Interface)
-
class Server(AdminViewBase, ZODBControlView):
"""Zope3 management screen.
"""
More information about the checkins
mailing list