[Checkins] SVN: grok/trunk/ global_adapter was never imported from grokcore.component, while it is still quite useful

[Jan-Wijbrand Kolman]

Log message for revision 121466:
  global_adapter was never imported from grokcore.component, while it is still quite useful

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

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2011-04-25 22:21:06 UTC (rev 121465)
+++ grok/trunk/CHANGES.txt	2011-04-27 08:01:21 UTC (rev 121466)
@@ -4,9 +4,8 @@
 1.7 (unreleased)
 ================
 
-- Nothing changed yet.
+- Import grokcore.component.global_adapter too.
 
-
 1.6 (2011-04-04)
 ================
 

Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2011-04-25 22:21:06 UTC (rev 121465)
+++ grok/trunk/src/grok/__init__.py	2011-04-27 08:01:21 UTC (rev 121466)
@@ -26,7 +26,8 @@
 from grokcore.component import Subscription, MultiSubscription
 from grokcore.component.decorators import subscribe, adapter, implementer
 from grokcore.component.directive import context, name, title, description
-from grokcore.component.directive import provides, global_utility, direct
+from grokcore.component.directive import provides, direct
+from grokcore.component.directive import global_utility, global_adapter
 
 from grokcore.content import Model, Container, OrderedContainer