[Checkins] SVN: grokcore.site/trunk/ use zope.container and zope.lifecycleevent
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Sun Dec 13 15:18:23 EST 2009
Log message for revision 106469:
use zope.container and zope.lifecycleevent
Changed:
U grokcore.site/trunk/CHANGES.txt
U grokcore.site/trunk/buildout.cfg
U grokcore.site/trunk/setup.py
U grokcore.site/trunk/src/grokcore/site/components.py
U grokcore.site/trunk/src/grokcore/site/ftests/site/site.py
U grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py
U grokcore.site/trunk/src/grokcore/site/meta.py
U grokcore.site/trunk/src/grokcore/site/subscriber.py
-=-
Modified: grokcore.site/trunk/CHANGES.txt
===================================================================
--- grokcore.site/trunk/CHANGES.txt 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/CHANGES.txt 2009-12-13 20:18:23 UTC (rev 106469)
@@ -1,6 +1,11 @@
Changes
=======
+1.2 (unreleased)
+----------------
+
+* ...
+
1.1 (2009-09-18)
----------------
Modified: grokcore.site/trunk/buildout.cfg
===================================================================
--- grokcore.site/trunk/buildout.cfg 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/buildout.cfg 2009-12-13 20:18:23 UTC (rev 106469)
@@ -1,7 +1,7 @@
[buildout]
develop = .
parts = interpreter test
-extends = http://grok.zope.org/releaseinfo/grok-1.0b2.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.1a1.cfg
versions = versions
[versions]
Modified: grokcore.site/trunk/setup.py
===================================================================
--- grokcore.site/trunk/setup.py 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/setup.py 2009-12-13 20:18:23 UTC (rev 106469)
@@ -45,9 +45,10 @@
'grokcore.component',
'martian',
'zope.annotation',
- 'zope.app.component',
- 'zope.app.container',
+ 'zope.component',
+ 'zope.container',
'zope.interface',
+ 'zope.lifecycleevent',
],
tests_require=tests_require,
extras_require={'test': tests_require},
Modified: grokcore.site/trunk/src/grokcore/site/components.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/components.py 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/src/grokcore/site/components.py 2009-12-13 20:18:23 UTC (rev 106469)
@@ -19,7 +19,7 @@
from zope.interface import implements
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.app.component.site import SiteManagerContainer
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
class BaseSite(object):
Modified: grokcore.site/trunk/src/grokcore/site/ftests/site/site.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftests/site/site.py 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/src/grokcore/site/ftests/site/site.py 2009-12-13 20:18:23 UTC (rev 106469)
@@ -36,7 +36,7 @@
"""
import grokcore.site
from persistent import Persistent
-from zope.app.container.btree import BTreeContainer
+from zope.container.btree import BTreeContainer
class Mammoth(grokcore.site.Site):
pass
Modified: grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py 2009-12-13 20:18:23 UTC (rev 106469)
@@ -27,7 +27,7 @@
import grokcore.site
from zope import interface
-from zope.app.container.btree import BTreeContainer
+from zope.container.btree import BTreeContainer
class IFireplace(interface.Interface):
pass
Modified: grokcore.site/trunk/src/grokcore/site/meta.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/meta.py 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/src/grokcore/site/meta.py 2009-12-13 20:18:23 UTC (rev 106469)
@@ -14,8 +14,8 @@
from zope import component
-from zope.app.container.interfaces import IContainer, IObjectAddedEvent
-from zope.app.container.interfaces import INameChooser
+from zope.lifecycleevent.interfaces import IObjectAddedEvent
+from zope.container.interfaces import IContainer, INameChooser
import martian
from martian.error import GrokError
Modified: grokcore.site/trunk/src/grokcore/site/subscriber.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/subscriber.py 2009-12-13 20:05:31 UTC (rev 106468)
+++ grokcore.site/trunk/src/grokcore/site/subscriber.py 2009-12-13 20:18:23 UTC (rev 106469)
@@ -12,10 +12,10 @@
#
##############################################################################
-import grokcore.component
+from zope.lifecycleevent.interfaces import IObjectAddedEvent
from zope.app.component.site import LocalSiteManager
-from zope.app.container.interfaces import IObjectAddedEvent
+import grokcore.component
from grokcore.site.components import Site
@grokcore.component.subscribe(Site, IObjectAddedEvent)
More information about the checkins
mailing list