Replaced an undeclared test dependency on zope.app.authentication wit…

…h zope.password svn merge ^/zope.app.generations/trunk -c 120944
zopefoundation · Jan 23, 2012 · 9233501 · 9233501
1 parent ff097c5
commit 9233501
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,7 +5,8 @@ CHANGES
 3.6.1 (unreleased)
 ------------------
 
-- ...
+- Replaced an undeclared test dependency on ``zope.app.authentication`` with
+  ``zope.password``.
 
 
 3.6.0 (2010-09-17)

diff --git a/setup.py b/setup.py
@@ -62,6 +62,7 @@ def read(*rnames):
           'zope.app.testing',
           'zope.app.zcmlfiles',
           'zope.login',
+          'zope.password',
           'zope.publisher >= 3.12',
           'zope.securitypolicy',
           ]),

diff --git a/src/zope/app/generations/ftesting.zcml b/src/zope/app/generations/ftesting.zcml
@@ -10,9 +10,9 @@
   <include package="zope.securitypolicy" file="meta.zcml" />
 
   <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.authentication" />
   <include package="zope.securitypolicy" />
   <include package="zope.login" />
+  <include package="zope.password" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />