[Checkins] SVN: grok/trunk/ - Import zope.app.container interfaces from their actual definition not from a

[Christian Zagrodnick]

Log message for revision 99696:
  - Import zope.app.container interfaces from their actual definition not from a
    re-import.
  
  
  

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/src/grok/__init__.py

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2009-05-03 22:28:07 UTC (rev 99695)
+++ grok/trunk/CHANGES.txt	2009-05-04 08:55:49 UTC (rev 99696)
@@ -4,7 +4,8 @@
 1.0b1 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Import zope.app.container interfaces from their actual definition not from a
+  re-import.
 
 
 1.0a3 (2009-04-10)

Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2009-05-03 22:28:07 UTC (rev 99695)
+++ grok/trunk/src/grok/__init__.py	2009-05-04 08:55:49 UTC (rev 99696)
@@ -60,11 +60,16 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
+from zope.app.container.interfaces import (
+    IObjectAddedEvent,
+    IObjectMovedEvent,
+    IObjectRemovedEvent,
+    IContainerModifiedEvent)
 from zope.app.container.contained import (
-    IObjectAddedEvent, ObjectAddedEvent,
-    IObjectMovedEvent, ObjectMovedEvent,
-    IObjectRemovedEvent, ObjectRemovedEvent,
-    IContainerModifiedEvent, ContainerModifiedEvent)
+    ObjectAddedEvent,
+    ObjectMovedEvent,
+    ObjectRemovedEvent,
+    ContainerModifiedEvent)
 
 from grok.components import Model, View
 from grok.components import XMLRPC, REST, JSON