[Checkins] SVN: grok/trunk/s import Subscription components too

[Jan-Wijbrand Kolman]

Log message for revision 120326:
  import Subscription components too

Changed:
  U   grok/trunk/setup.py
  U   grok/trunk/src/grok/__init__.py

-=-
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2011-02-14 10:46:15 UTC (rev 120325)
+++ grok/trunk/setup.py	2011-02-14 10:58:50 UTC (rev 120326)
@@ -43,7 +43,7 @@
     install_requires=[
         'ZODB3',
         'grokcore.annotation >= 1.1',
-        'grokcore.component >= 2.1',
+        'grokcore.component >= 2.3',
         'grokcore.content',
         'grokcore.formlib >= 1.4',
         'grokcore.json',

Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2011-02-14 10:46:15 UTC (rev 120325)
+++ grok/trunk/src/grok/__init__.py	2011-02-14 10:58:50 UTC (rev 120326)
@@ -20,10 +20,13 @@
 from martian import baseclass
 from martian.error import GrokError, GrokImportError
 
+from grokcore.component import Context
+from grokcore.component import GlobalUtility
 from grokcore.component import Adapter, MultiAdapter, GlobalUtility, Context
+from grokcore.component import Subscription, MultiSubscription
 from grokcore.component.decorators import subscribe, adapter, implementer
-from grokcore.component.directive import (
-    context, name, title, description, provides, global_utility, direct)
+from grokcore.component.directive import context, name, title, description
+from grokcore.component.directive import provides, global_utility, direct
 
 from grokcore.content import Model, Container, OrderedContainer