[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - adapter.py:1.1.2.3 addservicemanager.py:1.1.2.2 auth.py:1.1.2.2 cache.py:1.1.2.2 changeconfigurations.py:1.1.2.2 configurationstatuswidget.py:1.1.2.2 error.py:1.1.2.2 field.py:1.1.2.2 module.py:1.1.2.2 namecomponentconfigurableview.py:1.1.2.3 nameconfigurableview.py:1.1.2.2 role.py:1.1.2.2 service.py:1.1.2.3 view.py:1.1.2.3 zpt.py:1.1.2.2
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:48 -0500
Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/app/browser/services
Modified Files:
Tag: NameGeddon-branch
adapter.py addservicemanager.py auth.py cache.py
changeconfigurations.py configurationstatuswidget.py error.py
field.py module.py namecomponentconfigurableview.py
nameconfigurableview.py role.py service.py view.py zpt.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/app/browser/services/adapter.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/services/adapter.py:1.1.2.2 Mon Dec 23 18:52:30 2002
+++ Zope3/src/zope/app/browser/services/adapter.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""Views for local adapter configuration.
@@ -48,14 +48,14 @@
providedInterface = InterfaceField(title=u"Provided interface",
required=False,
)
-
+
class AdapterServiceView(BrowserView):
def __init__(self, *args):
super(AdapterServiceView, self).__init__(*args)
setUpWidgets(self, IAdapterSearch)
-
+
def configInfo(self):
forInterface = self.forInterface.getData()
providedInterface = self.providedInterface.getData()
=== Zope3/src/zope/app/browser/services/addservicemanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/addservicemanager.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/addservicemanager.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""
$Id$
=== Zope3/src/zope/app/browser/services/auth.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/auth.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/auth.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""Connection Management GUI
@@ -19,7 +19,7 @@
from zope.app.services.auth import User
class AddUser(BrowserView):
-
+
def action(self, id, title, description, login, password, roles):
user = User(id, title, description, login, password)
self.context.setObject(id, user)
@@ -34,7 +34,7 @@
from zope.publisher.browser import BrowserView
class EditUser(BrowserView):
-
+
def action(self, title, description, login, password, roles):
user = self.context
user.setTitle(title)
=== Zope3/src/zope/app/browser/services/cache.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/cache.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/cache.py Tue Dec 24 21:20:16 2002
@@ -45,4 +45,3 @@
cd = self.context.add(cd)
getWidgetsDataForContent(self, ICacheConfiguration, content=cd)
self.request.response.redirect(self.context.nextURL())
-
=== Zope3/src/zope/app/browser/services/changeconfigurations.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/changeconfigurations.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/changeconfigurations.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""
@@ -26,7 +26,7 @@
name = _prefix + ".active"
message = ''
configBase = ''
-
+
def setPrefix(self, prefix):
self._prefix = prefix
self.name = prefix + ".active"
@@ -61,7 +61,7 @@
# This is OK because configurations is just a list of dicts
configurations = removeAllProxies(configurations)
-
+
inactive = 1
for info in configurations:
if info['active']:
=== Zope3/src/zope/app/browser/services/configurationstatuswidget.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/configurationstatuswidget.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/configurationstatuswidget.py Tue Dec 24 21:20:16 2002
@@ -34,4 +34,3 @@
for v in (Unregistered, Registered, Active)
]
return ' '.join(result)
-
=== Zope3/src/zope/app/browser/services/error.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/error.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/error.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
""" Define view component for event service control.
@@ -31,4 +31,3 @@
copy_to_zlog = 0
errorLog.setProperties(keep_entries, copy_to_zlog, ignored_exceptions)
return self.request.response.redirect('main.html')
-
=== Zope3/src/zope/app/browser/services/field.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/field.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/field.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""A widget for ComponentLocation field.
=== Zope3/src/zope/app/browser/services/module.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/module.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/module.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""Handle form to create module
=== Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py:1.1.2.2 Tue Dec 24 07:50:53 2002
+++ Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py Tue Dec 24 21:20:16 2002
@@ -35,4 +35,3 @@
url = None
item_dict['url'] = url
return item_dict
-
=== Zope3/src/zope/app/browser/services/nameconfigurableview.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/nameconfigurableview.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/nameconfigurableview.py Tue Dec 24 21:20:16 2002
@@ -48,4 +48,3 @@
"inactive": cfg is None,
"view": view,
}
-
=== Zope3/src/zope/app/browser/services/role.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/role.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/role.py Tue Dec 24 21:20:16 2002
@@ -5,7 +5,7 @@
class Add(BrowserView):
"Provide a user interface for adding a contact"
-
+
__used_for__ = ILocalRoleService
def action(self, id, title, description):
@@ -25,4 +25,3 @@
class Contents(Contents):
pass
-
=== Zope3/src/zope/app/browser/services/service.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/services/service.py:1.1.2.2 Mon Dec 23 18:52:30 2002
+++ Zope3/src/zope/app/browser/services/service.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""Adding components for components and configuration
@@ -22,7 +22,7 @@
class ComponentAdding(ContentAdding):
"""Adding component for components
"""
-
+
menu_id = "add_component"
def action(self, type_name, id):
@@ -39,7 +39,7 @@
class ConfigurationAdding(ContentAdding):
"""Adding component for configuration
"""
-
+
menu_id = "add_configuration"
@@ -65,7 +65,7 @@
def action(self):
"""Perform actions depending on user input.
-
+
"""
if 'add_submit' in self.request:
self.request.response.redirect('+')
@@ -102,7 +102,7 @@
container = getAdapter(self.context, IZopeContainer)
for item in key_list:
del container[item]
-
+
def configInfo(self):
"""Render View for each direcitves.
"""
@@ -161,4 +161,3 @@
sd = self.context.add(sd)
getWidgetsDataForContent(self, IConfiguration, sd)
self.request.response.redirect(self.context.nextURL())
-
=== Zope3/src/zope/app/browser/services/view.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/services/view.py:1.1.2.2 Mon Dec 23 18:52:30 2002
+++ Zope3/src/zope/app/browser/services/view.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""Views for local view configuration.
@@ -61,14 +61,14 @@
layer = BytesLine(title=u'Layer',
required=False,
)
-
+
class ViewServiceView(BrowserView):
def __init__(self, *args):
super(ViewServiceView, self).__init__(*args)
setUpWidgets(self, IViewSearch)
-
+
def configInfo(self):
input_for = self.forInterface.getData()
input_type = self.presentationType.getData()
@@ -80,7 +80,7 @@
input_for, input_type, input_name, input_layer):
forInterface, presentationType, registry, layer, viewName = info
-
+
forInterface = (
forInterface.__module__ +"."+ forInterface.__name__)
presentationType = (
@@ -98,7 +98,7 @@
if input_layer is not None:
layer = None
-
+
result.append(
{'forInterface': forInterface,
'presentationType': presentationType,
=== Zope3/src/zope/app/browser/services/zpt.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/zpt.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/zpt.py Tue Dec 24 21:20:16 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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.
-#
+#
##############################################################################
"""XXX short summary goes here.
@@ -27,5 +27,3 @@
self.request.response.setHeader('content-type',
self.context.contentType)
return self.context.source
-
-