[Checkins] SVN: zope.app.server/trunk/ Use zope.password instead of zope.app.authentication
Nikolay Kim
fafhrd91 at gmail.com
Sat Dec 19 22:19:34 EST 2009
Log message for revision 106792:
Use zope.password instead of zope.app.authentication
Changed:
U zope.app.server/trunk/CHANGES.txt
U zope.app.server/trunk/buildout.cfg
U zope.app.server/trunk/setup.py
U zope.app.server/trunk/src/zope/app/server/mkzopeinstance.py
U zope.app.server/trunk/src/zope/app/server/servercontrol.py
U zope.app.server/trunk/src/zope/app/server/tests/test_mkzopeinstance.py
U zope.app.server/trunk/src/zope/app/server/tests/test_zpasswd.py
U zope.app.server/trunk/src/zope/app/server/zpasswd.py
-=-
Modified: zope.app.server/trunk/CHANGES.txt
===================================================================
--- zope.app.server/trunk/CHANGES.txt 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/CHANGES.txt 2009-12-20 03:19:33 UTC (rev 106792)
@@ -2,9 +2,11 @@
CHANGES
=======
-3.4.3 (unreleased)
+3.5.0 (unreleased)
------------------
+- Use ``zope.password`` instead of ``zope.app.authentication``
+
- Depend on new ``zope.processlifetime`` implementations instead of
using BBB imports from ``zope.app.appsetup``.
Modified: zope.app.server/trunk/buildout.cfg
===================================================================
--- zope.app.server/trunk/buildout.cfg 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/buildout.cfg 2009-12-20 03:19:33 UTC (rev 106792)
@@ -18,7 +18,7 @@
<include package="zope.app.server" />
<include package="zope.app.securitypolicy" />
<include package="zope.app.securitypolicy" file="meta.zcml" />
- <include package="zope.app.authentication" />
+ <include package="zope.password" />
<securityPolicy
component="zope.security.simplepolicies.PermissiveSecurityPolicy" />
Modified: zope.app.server/trunk/setup.py
===================================================================
--- zope.app.server/trunk/setup.py 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/setup.py 2009-12-20 03:19:33 UTC (rev 106792)
@@ -27,7 +27,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.app.server',
- version = '3.4.3dev',
+ version = '3.5.0dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='ZServer integration for Zope 3 Applications',
@@ -56,7 +56,6 @@
install_requires=['setuptools',
'zope.app.applicationcontrol',
'zope.app.appsetup >= 3.11.0',
- 'zope.app.authentication',
'zope.app.publication',
'zope.app.wsgi',
'zope.configuration',
@@ -64,6 +63,7 @@
'zope.interface',
'zope.publisher',
'zope.server',
+ 'zope.password',
'zope.processlifetime',
'zdaemon',
'ZConfig',
Modified: zope.app.server/trunk/src/zope/app/server/mkzopeinstance.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/mkzopeinstance.py 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/src/zope/app/server/mkzopeinstance.py 2009-12-20 03:19:33 UTC (rev 106792)
@@ -29,7 +29,7 @@
from xml.sax.saxutils import quoteattr as xml_quoteattr
import zope.app.server
-from zope.app.authentication import password
+from zope.password import password
from zope.app.applicationcontrol import zopeversion
def main(argv=None, from_checkout=False):
@@ -193,7 +193,7 @@
index -= 1
break
print >>sys.stderr, "You must select a password manager"
- print "%r password manager selected" % password.managers[index][0]
+ print "%r password manager selected" % password.managers[index][0]
return password.managers[index]
def print_message(self, message):
@@ -227,8 +227,8 @@
'zopeskel'),
self.options.destination,
)
-
+
def copytree(self, src, dst):
# Similar to shutil.copytree(), but doesn't care about
# symlinks, doesn't collect errors, and uses self.copyfile()
@@ -327,7 +327,7 @@
""",
)
-
+
options, args = p.parse_args(argv[1:])
if options.skeleton is None:
options.add_package_includes = from_checkout
Modified: zope.app.server/trunk/src/zope/app/server/servercontrol.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/servercontrol.py 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/src/zope/app/server/servercontrol.py 2009-12-20 03:19:33 UTC (rev 106792)
@@ -41,6 +41,6 @@
# Passing an exit status of 1 causes zdaemon to restart the process.
zope.app.server.main.exit_status = 1
-
+
serverControl = ServerControl()
Modified: zope.app.server/trunk/src/zope/app/server/tests/test_mkzopeinstance.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/tests/test_mkzopeinstance.py 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/src/zope/app/server/tests/test_mkzopeinstance.py 2009-12-20 03:19:33 UTC (rev 106792)
@@ -198,7 +198,7 @@
f = open(os.path.join(self.skeleton, 'bin', 'runzope.in'), 'w')
f.write('runzope')
f.close()
-
+
options = self.createOptions()
options.destination = self.instance
options.interactive = False
Modified: zope.app.server/trunk/src/zope/app/server/tests/test_zpasswd.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/tests/test_zpasswd.py 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/src/zope/app/server/tests/test_zpasswd.py 2009-12-20 03:19:33 UTC (rev 106792)
@@ -17,11 +17,9 @@
"""
import os
-import unittest
+import unittest, doctest
-from zope.testing.doctestunit import DocTestSuite
-
-from zope.app.authentication import password
+from zope.password import password
from zope.app.server.tests.test_mkzopeinstance import TestBase
from zope.app.server import zpasswd
@@ -132,7 +130,7 @@
def test_suite():
- suite = DocTestSuite('zope.app.server.zpasswd')
+ suite = doctest.DocTestSuite('zope.app.server.zpasswd')
suite.addTest(unittest.makeSuite(ArgumentParsingTestCase))
suite.addTest(unittest.makeSuite(InputCollectionTestCase))
return suite
Modified: zope.app.server/trunk/src/zope/app/server/zpasswd.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/zpasswd.py 2009-12-20 01:15:41 UTC (rev 106791)
+++ zope.app.server/trunk/src/zope/app/server/zpasswd.py 2009-12-20 03:19:33 UTC (rev 106792)
@@ -239,11 +239,11 @@
def get_password_managers(config_path=None):
if not config_path:
- from zope.app.authentication.password import managers
+ from zope.password.password import managers
else:
from zope.configuration import xmlconfig
from zope.component import getUtilitiesFor
- from zope.app.authentication.interfaces import IPasswordManager
+ from zope.password.interfaces import IPasswordManager
print "Loading configuration..."
config = xmlconfig.file(config_path)
@@ -254,7 +254,7 @@
else:
managers.append((name, manager))
if not managers:
- from zope.app.authentication.password import managers
+ from zope.password.password import managers
return managers
def parse_args(argv):
More information about the checkins
mailing list