[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/authentication/
Removed unused namespaces from ZCML files.
Florent Xicluna
laxyf at yahoo.fr
Sat Sep 30 06:01:27 EDT 2006
Log message for revision 70448:
Removed unused namespaces from ZCML files.
Increased conformity with style guide: http://dev.zope.org/Zope3/ZCMLStyleGuide
Changed:
U Zope3/trunk/src/zope/app/authentication/browser/configure.zcml
U Zope3/trunk/src/zope/app/authentication/browser/groupfolder.zcml
U Zope3/trunk/src/zope/app/authentication/browser/httpplugins.zcml
U Zope3/trunk/src/zope/app/authentication/browser/principalfolder.zcml
U Zope3/trunk/src/zope/app/authentication/browser/session.zcml
U Zope3/trunk/src/zope/app/authentication/configure.zcml
U Zope3/trunk/src/zope/app/authentication/ftpplugins.zcml
U Zope3/trunk/src/zope/app/authentication/groupfolder.zcml
U Zope3/trunk/src/zope/app/authentication/httpplugins.zcml
U Zope3/trunk/src/zope/app/authentication/password.zcml
U Zope3/trunk/src/zope/app/authentication/principalfolder.zcml
U Zope3/trunk/src/zope/app/authentication/session.py
U Zope3/trunk/src/zope/app/authentication/session.zcml
-=-
Modified: Zope3/trunk/src/zope/app/authentication/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/configure.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/browser/configure.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,7 +1,8 @@
-<zope:configure
+<configure
xmlns:zope="http://namespaces.zope.org/zope"
xmlns="http://namespaces.zope.org/browser"
- i18n_domain="zope">
+ i18n_domain="zope"
+ >
<addform
schema="..interfaces.IPluggableAuthentication"
@@ -10,24 +11,25 @@
fields="prefix"
keyword_arguments="prefix"
name="AddPluggableAuthentication.html"
- permission="zope.ManageServices">
+ permission="zope.ManageServices"
+ >
- <widget
- field="prefix"
- class="zope.app.form.browser.TextWidget"
- required="False"
- convert_missing_value="False"
- />
+ <widget
+ field="prefix"
+ class="zope.app.form.browser.TextWidget"
+ required="False"
+ convert_missing_value="False"
+ />
</addform>
<addMenuItem
- class="..authentication.PluggableAuthentication"
- view="AddPluggableAuthentication.html"
- title="Pluggable Authentication Utility"
- description="New-style pluggable authentication utility"
- permission="zope.ManageServices"
- />
+ class="..authentication.PluggableAuthentication"
+ view="AddPluggableAuthentication.html"
+ title="Pluggable Authentication Utility"
+ description="New-style pluggable authentication utility"
+ permission="zope.ManageServices"
+ />
<page
for="..interfaces.IPluggableAuthentication"
@@ -42,7 +44,8 @@
name="configure.html"
fields="prefix credentialsPlugins authenticatorPlugins"
menu="zmi_views" title="Configure"
- permission="zope.ManageServices" />
+ permission="zope.ManageServices"
+ />
<page
name="contents.html"
@@ -60,8 +63,14 @@
permission="zope.ManageSite"
class=".adding.Adding"
>
- <page name="index.html" attribute="index" />
- <page name="action.html" attribute="action" />
+ <page
+ name="index.html"
+ attribute="index"
+ />
+ <page
+ name="action.html"
+ attribute="action"
+ />
</view>
<menuItem
@@ -69,7 +78,8 @@
for="..interfaces.IPluggableAuthentication"
title="Contents"
action=""
- filter="python:False" />
+ filter="python:False"
+ />
<zope:adapter
for="..interfaces.IQuerySchemaSearch
@@ -78,4 +88,4 @@
factory=".schemasearch.QuerySchemaSearchView"
/>
-</zope:configure>
+</configure>
Modified: Zope3/trunk/src/zope/app/authentication/browser/groupfolder.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/groupfolder.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/browser/groupfolder.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,9 +1,8 @@
<configure
- xmlns='http://namespaces.zope.org/browser'
+ xmlns="http://namespaces.zope.org/browser"
i18n_domain="zope"
- xmlns:i18n="http://namespaces.zope.org/i18n"
>
-
+
<editform
schema="..groupfolder.IGroupInformation"
label="Change group information"
@@ -11,7 +10,7 @@
menu="zmi_views" title="Edit"
permission="zope.ManageServices"
/>
-
+
<addform
schema="..groupfolder.IGroupInformation"
content_factory="..groupfolder.GroupInformation"
@@ -20,7 +19,7 @@
permission="zope.ManageServices"
fields="title description"
/>
-
+
<addMenuItem
title="Group"
description="A principals group"
@@ -28,7 +27,7 @@
permission="zope.ManageServices"
view="AddGroupInformation.html"
/>
-
+
<addform
schema="..groupfolder.IGroupFolder"
content_factory="..groupfolder.GroupFolder"
@@ -45,12 +44,12 @@
permission="zope.ManageServices"
view="AddGroupFolder.html"
/>
-
+
<containerViews
- for="..groupfolder.IGroupFolder"
- contents="zope.ManageServices"
- index="zope.ManageServices"
- add="zope.ManageServices"
- />
-
+ for="..groupfolder.IGroupFolder"
+ contents="zope.ManageServices"
+ index="zope.ManageServices"
+ add="zope.ManageServices"
+ />
+
</configure>
Modified: Zope3/trunk/src/zope/app/authentication/browser/httpplugins.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/httpplugins.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/browser/httpplugins.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,9 +1,8 @@
<configure
- xmlns='http://namespaces.zope.org/browser'
+ xmlns="http://namespaces.zope.org/browser"
i18n_domain="zope"
- xmlns:i18n="http://namespaces.zope.org/i18n"
>
-
+
<addMenuItem
title="HTTP Basic-Auth Plugin"
class="..httpplugins.HTTPBasicAuthCredentialsPlugin"
@@ -15,6 +14,7 @@
label="Realm"
name="edit.html"
permission="zope.ManageServices"
- menu="zmi_views" title="Edit" />
+ menu="zmi_views" title="Edit"
+ />
-</configure>
\ No newline at end of file
+</configure>
Modified: Zope3/trunk/src/zope/app/authentication/browser/principalfolder.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/principalfolder.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/browser/principalfolder.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,6 +1,6 @@
-<zope:configure
- xmlns:zope="http://namespaces.zope.org/zope"
- xmlns="http://namespaces.zope.org/browser">
+<configure
+ xmlns="http://namespaces.zope.org/browser"
+ >
<addform
schema="..principalfolder.IInternalPrincipalContainer"
@@ -43,7 +43,8 @@
name="edit.html"
fields="login passwordManagerName password title description"
permission="zope.ManageServices"
- menu="zmi_views" title="Edit" />
+ menu="zmi_views" title="Edit"
+ />
<containerViews
for="..principalfolder.IInternalPrincipalContainer"
@@ -58,6 +59,7 @@
name="prefix.html"
fields="prefix"
permission="zope.ManageServices"
- menu="zmi_views" title="Prefix" />
+ menu="zmi_views" title="Prefix"
+ />
-</zope:configure>
+</configure>
Modified: Zope3/trunk/src/zope/app/authentication/browser/session.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/session.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/browser/session.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,6 +1,6 @@
-<zope:configure
- xmlns:zope="http://namespaces.zope.org/zope"
- xmlns="http://namespaces.zope.org/browser">
+<configure
+ xmlns="http://namespaces.zope.org/browser"
+ >
<addMenuItem
title="Session Credentials Plugin"
@@ -13,7 +13,8 @@
label="Browser Form Challenger"
name="edit.html"
permission="zope.ManageServices"
- menu="zmi_views" title="Edit" />
+ menu="zmi_views" title="Edit"
+ />
<page
name="loginForm.html"
@@ -22,4 +23,4 @@
permission="zope.Public"
/>
-</zope:configure>
+</configure>
Modified: Zope3/trunk/src/zope/app/authentication/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/configure.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/configure.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -21,7 +21,7 @@
<adapter
for=".interfaces.IQuerySchemaSearch
- .interfaces.IPluggableAuthentication"
+ .interfaces.IPluggableAuthentication"
provides=".interfaces.IQueriableAuthenticator"
factory=".authentication.QuerySchemaSearchAdapter"
/>
Modified: Zope3/trunk/src/zope/app/authentication/ftpplugins.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/ftpplugins.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/ftpplugins.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,11 +1,12 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope">
+ i18n_domain="zope"
+ >
<utility
- name="FTP Credentials"
- provides=".interfaces.ICredentialsPlugin"
- factory=".ftpplugins.FTPCredentialsPlugin"
- />
+ name="FTP Credentials"
+ provides=".interfaces.ICredentialsPlugin"
+ factory=".ftpplugins.FTPCredentialsPlugin"
+ />
</configure>
Modified: Zope3/trunk/src/zope/app/authentication/groupfolder.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/groupfolder.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/groupfolder.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,29 +1,29 @@
<configure
- xmlns='http://namespaces.zope.org/zope'
- xmlns:browser='http://namespaces.zope.org/browser'
+ xmlns="http://namespaces.zope.org/zope"
i18n_domain="zope"
- xmlns:i18n="http://namespaces.zope.org/i18n"
>
<class class=".groupfolder.GroupInformation">
- <require
- permission="zope.ManageServices"
- interface=".groupfolder.IGroupInformation
- .groupfolder.IGroupContained"
- set_schema=".groupfolder.IGroupInformation"
- />
- <implements
- interface="zope.annotation.interfaces.IAttributeAnnotatable"
- />
+ <implements
+ interface="zope.annotation.interfaces.IAttributeAnnotatable"
+ />
+ <require
+ permission="zope.ManageServices"
+ interface=".groupfolder.IGroupInformation
+ .groupfolder.IGroupContained"
+ set_schema=".groupfolder.IGroupInformation"
+ />
</class>
<class class=".groupfolder.GroupFolder">
<implements
- interface=".groupfolder.IGroupFolder" />
+ interface=".groupfolder.IGroupFolder"
+ />
<require
permission="zope.ManageServices"
interface="zope.app.container.interfaces.IContainer
- zope.app.container.interfaces.INameChooser" />
+ zope.app.container.interfaces.INameChooser"
+ />
</class>
<adapter
@@ -42,7 +42,9 @@
handler=".groupfolder.setGroupsForPrincipal"
/>
- <subscriber handler=".groupfolder.setMemberSubscriber" />
+ <subscriber
+ handler=".groupfolder.setMemberSubscriber"
+ />
<include package=".browser" file="groupfolder.zcml" />
Modified: Zope3/trunk/src/zope/app/authentication/httpplugins.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/httpplugins.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/httpplugins.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,6 +1,5 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope"
>
Modified: Zope3/trunk/src/zope/app/authentication/password.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/password.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/password.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,40 +1,41 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope">
+ i18n_domain="zope"
+ >
<utility
- component=".password.PasswordManagerNamesVocabulary"
- name="Password Manager Names"
- />
+ component=".password.PasswordManagerNamesVocabulary"
+ name="Password Manager Names"
+ />
<class class=".password.PlainTextPasswordManager">
- <allow interface=".interfaces.IPasswordManager"/>
+ <allow interface=".interfaces.IPasswordManager" />
</class>
<utility
- name="Plain Text"
- provides=".interfaces.IPasswordManager"
- factory=".password.PlainTextPasswordManager"
- />
+ name="Plain Text"
+ provides=".interfaces.IPasswordManager"
+ factory=".password.PlainTextPasswordManager"
+ />
<class class=".password.MD5PasswordManager">
- <allow interface=".interfaces.IPasswordManager"/>
+ <allow interface=".interfaces.IPasswordManager" />
</class>
<utility
- name="MD5"
- provides=".interfaces.IPasswordManager"
- factory=".password.MD5PasswordManager"
- />
+ name="MD5"
+ provides=".interfaces.IPasswordManager"
+ factory=".password.MD5PasswordManager"
+ />
<class class=".password.SHA1PasswordManager">
- <allow interface=".interfaces.IPasswordManager"/>
+ <allow interface=".interfaces.IPasswordManager" />
</class>
<utility
- name="SHA1"
- provides=".interfaces.IPasswordManager"
- factory=".password.SHA1PasswordManager"
- />
+ name="SHA1"
+ provides=".interfaces.IPasswordManager"
+ factory=".password.SHA1PasswordManager"
+ />
</configure>
Modified: Zope3/trunk/src/zope/app/authentication/principalfolder.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/principalfolder.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/principalfolder.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,6 +1,5 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope"
>
Modified: Zope3/trunk/src/zope/app/authentication/session.py
===================================================================
--- Zope3/trunk/src/zope/app/authentication/session.py 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/session.py 2006-09-30 10:01:26 UTC (rev 70448)
@@ -275,7 +275,7 @@
stack = request.getTraversalStack()
stack.reverse()
# Better to add the query string, if present
- query = request.get('QUERY_STRING','')
+ query = request.get('QUERY_STRING')
camefrom = '/'.join([request.getURL(path_only=True)] + stack)
if query:
Modified: Zope3/trunk/src/zope/app/authentication/session.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/session.zcml 2006-09-30 09:13:17 UTC (rev 70447)
+++ Zope3/trunk/src/zope/app/authentication/session.zcml 2006-09-30 10:01:26 UTC (rev 70448)
@@ -1,6 +1,5 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope"
>
More information about the Zope3-Checkins
mailing list