[Checkins] SVN: zope.app.authentication/trunk/ The "Password Manager Names" vocabulary was moved to the ``zope.password`` package.

[Dan Korostelev]

Log message for revision 97791:
  The "Password Manager Names" vocabulary was moved to the ``zope.password`` package.

Changed:
  U   zope.app.authentication/trunk/CHANGES.txt
  U   zope.app.authentication/trunk/buildout.cfg
  U   zope.app.authentication/trunk/src/zope/app/authentication/password.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/password.zcml

-=-
Modified: zope.app.authentication/trunk/CHANGES.txt
===================================================================
--- zope.app.authentication/trunk/CHANGES.txt	2009-03-10 08:47:51 UTC (rev 97790)
+++ zope.app.authentication/trunk/CHANGES.txt	2009-03-10 08:49:55 UTC (rev 97791)
@@ -7,6 +7,9 @@
 
 * Remove deprecated code.
 
+* The "Password Manager Names" vocabulary was moved to the ``zope.password``
+  package.
+
 3.5.0 (2009-03-06)
 ------------------
 

Modified: zope.app.authentication/trunk/buildout.cfg
===================================================================
--- zope.app.authentication/trunk/buildout.cfg	2009-03-10 08:47:51 UTC (rev 97790)
+++ zope.app.authentication/trunk/buildout.cfg	2009-03-10 08:49:55 UTC (rev 97791)
@@ -1,5 +1,5 @@
 [buildout]
-develop = .
+develop = . ../zope.password
 parts = test
 
 [test]

Modified: zope.app.authentication/trunk/src/zope/app/authentication/password.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/password.py	2009-03-10 08:47:51 UTC (rev 97790)
+++ zope.app.authentication/trunk/src/zope/app/authentication/password.py	2009-03-10 08:49:55 UTC (rev 97791)
@@ -17,8 +17,6 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app.component.vocabulary import UtilityVocabulary
-
 # BBB: the password managers were moved into zope.password package.
 from zope.password.password import (
     PlainTextPasswordManager,
@@ -27,6 +25,7 @@
     SSHAPasswordManager
     )
 from zope.password.interfaces import IPasswordManager
+from zope.password.vocabulary import PasswordManagerNamesVocabulary
 
 # Simple registry used by mkzopeinstance script
 managers = [
@@ -35,10 +34,3 @@
     ("SHA1", SHA1PasswordManager()),
     ("SSHA", SSHAPasswordManager()),
 ]
-
-
-class PasswordManagerNamesVocabulary(UtilityVocabulary):
-    """Vocabulary of password managers."""
-
-    interface = IPasswordManager
-    nameOnly = True

Modified: zope.app.authentication/trunk/src/zope/app/authentication/password.zcml
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/password.zcml	2009-03-10 08:47:51 UTC (rev 97790)
+++ zope.app.authentication/trunk/src/zope/app/authentication/password.zcml	2009-03-10 08:49:55 UTC (rev 97791)
@@ -2,10 +2,4 @@
 
   <include package="zope.password" />
 
-  <utility
-      component=".password.PasswordManagerNamesVocabulary"
-      provides="zope.schema.interfaces.IVocabularyFactory"
-      name="Password Manager Names"
-      />
-
 </configure>