[Checkins] SVN: zope.component/branches/jinty-optional-event/s Make dependency totally optional and convert in-tree users

[Brian Sutherland]

Log message for revision 109652:
  Make dependency totally optional and convert in-tree users

Changed:
  U   zope.component/branches/jinty-optional-event/setup.py
  U   zope.component/branches/jinty-optional-event/src/zope/component/event.txt
  U   zope.component/branches/jinty-optional-event/src/zope/component/registry.py
  U   zope.component/branches/jinty-optional-event/src/zope/component/registry.txt
  U   zope.component/branches/jinty-optional-event/src/zope/component/tests.py

-=-
Modified: zope.component/branches/jinty-optional-event/setup.py
===================================================================
--- zope.component/branches/jinty-optional-event/setup.py	2010-03-04 15:53:28 UTC (rev 109651)
+++ zope.component/branches/jinty-optional-event/setup.py	2010-03-04 15:54:37 UTC (rev 109652)
@@ -72,7 +72,7 @@
         ],
     install_requires=['setuptools',
                       'zope.interface',
-                      'zope.event',
+                      #'zope.event', - Purely optional
                       ],
     include_package_data = True,
     zip_safe = False,

Modified: zope.component/branches/jinty-optional-event/src/zope/component/event.txt
===================================================================
--- zope.component/branches/jinty-optional-event/src/zope/component/event.txt	2010-03-04 15:53:28 UTC (rev 109651)
+++ zope.component/branches/jinty-optional-event/src/zope/component/event.txt	2010-03-04 15:54:37 UTC (rev 109652)
@@ -39,7 +39,7 @@
 Now let's go through the events.  We'll see that the handlers have been
 called accordingly:
 
-  >>> from zope.event import notify
+  >>> from zope.component.event import notify
   >>> notify(Event1())
   >>> called
   [1]

Modified: zope.component/branches/jinty-optional-event/src/zope/component/registry.py
===================================================================
--- zope.component/branches/jinty-optional-event/src/zope/component/registry.py	2010-03-04 15:53:28 UTC (rev 109651)
+++ zope.component/branches/jinty-optional-event/src/zope/component/registry.py	2010-03-04 15:54:37 UTC (rev 109652)
@@ -37,7 +37,7 @@
 from zope.component.interfaces import Unregistered
 from zope.component._api import handle
 from zope.component._declaration import adapter
-from zope.event import notify
+from zope.component._event import notify
 
 class Components(object):
 

Modified: zope.component/branches/jinty-optional-event/src/zope/component/registry.txt
===================================================================
--- zope.component/branches/jinty-optional-event/src/zope/component/registry.txt	2010-03-04 15:53:28 UTC (rev 109651)
+++ zope.component/branches/jinty-optional-event/src/zope/component/registry.txt	2010-03-04 15:54:37 UTC (rev 109652)
@@ -23,10 +23,10 @@
 As components are registered, events are generated.  Let's register
 an event subscriber, so we can see the events generated:
 
-    >>> import zope.event
+    >>> import zope.component.event
     >>> def logevent(event):
     ...     print event
-    >>> zope.event.subscribers.append(logevent)
+    >>> zope.component.event.subscribers.append(logevent)
     
 Utilities
 ---------

Modified: zope.component/branches/jinty-optional-event/src/zope/component/tests.py
===================================================================
--- zope.component/branches/jinty-optional-event/src/zope/component/tests.py	2010-03-04 15:53:28 UTC (rev 109651)
+++ zope.component/branches/jinty-optional-event/src/zope/component/tests.py	2010-03-04 15:54:37 UTC (rev 109652)
@@ -1664,8 +1664,8 @@
 
 def tearDownRegistryTests(tests):
     tearDown()
-    import zope.event
-    zope.event.subscribers.pop()
+    import zope.component.event
+    zope.component.event.subscribers.pop()
 
 def clearZCML(test=None):
     tearDown()