[Checkins] SVN: zope.session/trunk/ Bootstrapping code was moved into zope.app.appsetup.
Dan Korostelev
nadako at gmail.com
Mon Mar 16 11:46:45 EDT 2009
Log message for revision 98144:
Bootstrapping code was moved into zope.app.appsetup.
Drop testing dependencies, as we don't need anything behind zope.testing.
Update package's description a bit.
Changed:
U zope.session/trunk/CHANGES.txt
U zope.session/trunk/README.txt
U zope.session/trunk/buildout.cfg
U zope.session/trunk/setup.py
D zope.session/trunk/src/zope/session/bootstrap.py
U zope.session/trunk/src/zope/session/subscribers.zcml
U zope.session/trunk/src/zope/session/tests.py
-=-
Modified: zope.session/trunk/CHANGES.txt
===================================================================
--- zope.session/trunk/CHANGES.txt 2009-03-16 15:38:47 UTC (rev 98143)
+++ zope.session/trunk/CHANGES.txt 2009-03-16 15:46:45 UTC (rev 98144)
@@ -17,8 +17,17 @@
- Drop dependency on zope.app.http, use http-date building function
from zope.datetime instead.
+- Zope 3 application bootstrapping code for session utilities was moved into
+ zope.app.appsetup package, thus drop dependency on zope.app.appsetup in this
+ package.
+
+- Drop testing dependencies, as we don't need anything behind zope.testing and
+ previous dependencies was simply migrated from zope.app.session before.
+
- Remove zpkg files and zcml slugs.
+- Update package's description a bit.
+
3.8.1 (2009-02-23)
------------------
Modified: zope.session/trunk/README.txt
===================================================================
--- zope.session/trunk/README.txt 2009-03-16 15:38:47 UTC (rev 98143)
+++ zope.session/trunk/README.txt 2009-03-16 15:46:45 UTC (rev 98144)
@@ -1 +1,2 @@
-This package provides session support.
+This package provides client identification and session support for zope.publisher's
+request objects.
Modified: zope.session/trunk/buildout.cfg
===================================================================
--- zope.session/trunk/buildout.cfg 2009-03-16 15:38:47 UTC (rev 98143)
+++ zope.session/trunk/buildout.cfg 2009-03-16 15:46:45 UTC (rev 98144)
@@ -4,7 +4,7 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.session [test]
+eggs = zope.session
[py]
recipe = zc.recipe.egg
Modified: zope.session/trunk/setup.py
===================================================================
--- zope.session/trunk/setup.py 2009-03-16 15:38:47 UTC (rev 98143)
+++ zope.session/trunk/setup.py 2009-03-16 15:46:45 UTC (rev 98144)
@@ -27,7 +27,7 @@
version = '3.8.2dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
- description='Zope 3 Session Support',
+ description='Client identification and sessions for Zope',
long_description=(
read('README.txt')
+ '\n\n.. contents::\n\n' +
@@ -53,17 +53,9 @@
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope',],
- extras_require = dict(
- test=['zope.app.testing',
- 'zope.app.publication',
- 'zope.site',
- 'zope.app.zptpage',
- 'zope.app.securitypolicy',
- 'zope.app.zcmlfiles']),
install_requires=[
'setuptools',
'ZODB3',
- 'zope.app.appsetup',
'zope.datetime',
'zope.component',
'zope.i18nmessageid',
Deleted: zope.session/trunk/src/zope/session/bootstrap.py
===================================================================
--- zope.session/trunk/src/zope/session/bootstrap.py 2009-03-16 15:38:47 UTC (rev 98143)
+++ zope.session/trunk/src/zope/session/bootstrap.py 2009-03-16 15:46:45 UTC (rev 98144)
@@ -1,53 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2002, 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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.
-#
-##############################################################################
-"""Bootstrap code.
-
-This module contains code to bootstrap a Zope3 instance. For example
-it makes sure a root folder exists and creates and configures some
-essential utilities.
-
-$Id$
-"""
-
-import transaction
-
-from zope.app.appsetup.bootstrap import ensureUtility, getInformationFromEvent
-
-from zope.session.interfaces import IClientIdManager, ISessionDataContainer
-from zope.session.http import CookieClientIdManager
-from zope.session.session import PersistentSessionDataContainer
-
-def bootStrapSubscriber(event):
- """Subscriber to the IDataBaseOpenedEvent
-
- Create utility at that time if not yet present
- """
-
- db, connection, root, root_folder = getInformationFromEvent(event)
-
- ensureUtility(
- root_folder,
- IClientIdManager, 'CookieClientIdManager',
- CookieClientIdManager,
- asObject=True,
- )
- ensureUtility(
- root_folder,
- ISessionDataContainer, 'PersistentSessionDataContainer',
- PersistentSessionDataContainer,
- asObject=True,
- )
-
- transaction.commit()
- connection.close()
Modified: zope.session/trunk/src/zope/session/subscribers.zcml
===================================================================
--- zope.session/trunk/src/zope/session/subscribers.zcml 2009-03-16 15:38:47 UTC (rev 98143)
+++ zope.session/trunk/src/zope/session/subscribers.zcml 2009-03-16 15:46:45 UTC (rev 98144)
@@ -1,11 +1,6 @@
<configure xmlns="http://namespaces.zope.org/zope">
<subscriber
- for="zope.app.appsetup.IDatabaseOpenedEvent"
- handler=".bootstrap.bootStrapSubscriber"
- />
-
- <subscriber
for="zope.publisher.interfaces.http.IHTTPVirtualHostChangedEvent"
handler=".http.notifyVirtualHostChanged"
/>
Modified: zope.session/trunk/src/zope/session/tests.py
===================================================================
--- zope.session/trunk/src/zope/session/tests.py 2009-03-16 15:38:47 UTC (rev 98143)
+++ zope.session/trunk/src/zope/session/tests.py 2009-03-16 15:46:45 UTC (rev 98144)
@@ -19,8 +19,7 @@
import unittest, os, os.path
import zope.component
-from zope.testing import doctest
-from zope.app.testing import placelesssetup
+from zope.testing import doctest, cleanup
import transaction
from zope.component import provideHandler, getGlobalSiteManager
@@ -31,18 +30,12 @@
from zope.session.session import PersistentSessionDataContainer
from zope.session.session import RAMSessionDataContainer
from zope.session.http import CookieClientIdManager
-from zope.session.bootstrap import bootStrapSubscriber as \
- sessionBootstrapSubscriber
from zope.publisher.interfaces import IRequest
from zope.publisher.http import HTTPRequest
-from zope.app.appsetup.tests import TestBootstrapSubscriber, EventStub
-from zope.app.appsetup.bootstrap import bootStrapSubscriber
-
-
def setUp(session_data_container_class=PersistentSessionDataContainer):
- placelesssetup.setUp()
+ cleanup.setUp()
zope.component.provideAdapter(ClientId, (IRequest,), IClientId)
zope.component.provideAdapter(Session, (IRequest,), ISession)
zope.component.provideUtility(CookieClientIdManager(), IClientIdManager)
@@ -53,29 +46,8 @@
return request
def tearDown():
- placelesssetup.tearDown()
+ cleanup.tearDown()
-class TestBootstrap(TestBootstrapSubscriber):
-
- def test_bootstrapSusbcriber(self):
- bootStrapSubscriber(EventStub(self.db))
-
- sessionBootstrapSubscriber(EventStub(self.db))
-
- import zope.component
- from zope.app.publication.zopepublication import ZopePublication
- from zope.site.hooks import setSite
-
- cx = self.db.open()
- root = cx.root()
- root_folder = root[ZopePublication.root_name]
- setSite(root_folder)
-
- zope.component.getUtility(IClientIdManager)
- zope.component.getUtility(ISessionDataContainer)
-
- cx.close()
-
# Test the code in our API documentation is correct
def test_documentation():
pass
@@ -158,7 +130,6 @@
def test_suite():
suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(TestBootstrap))
suite.addTest(doctest.DocTestSuite())
suite.addTest(doctest.DocTestSuite('zope.session.session',
tearDown=tearDownTransaction))
More information about the Checkins
mailing list