[Checkins] SVN: grok/trunk/ added the query*Subscriptions() functions that complement the (Multi)Subscriptions components. They should\'ve been added in a previous release I guess, but alas.

[Jan-Wijbrand Kolman]

Log message for revision 122731:
  added the query*Subscriptions() functions that complement the (Multi)Subscriptions components. They should\'ve been added in a previous release I guess, but alas.

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

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2011-09-05 18:49:51 UTC (rev 122730)
+++ grok/trunk/CHANGES.txt	2011-09-06 20:53:26 UTC (rev 122731)
@@ -4,9 +4,10 @@
 1.9 (unreleased)
 ================
 
-- Nothing changed yet.
+- Added imports for `querySubscriptions()`, `queryMultiSubscriptions()`,
+  `queryOrderedSubscriptions()` and `queryOrderedMultiSubscriptions()` functions
+  that complement the Subscriptions and MultiSubscriptions components.
 
-
 1.8 (2011-07-14)
 ================
 

Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2011-09-05 18:49:51 UTC (rev 122730)
+++ grok/trunk/src/grok/__init__.py	2011-09-06 20:53:26 UTC (rev 122731)
@@ -24,6 +24,9 @@
 from grokcore.component import GlobalUtility
 from grokcore.component import Adapter, MultiAdapter, GlobalUtility, Context
 from grokcore.component import Subscription, MultiSubscription
+from grokcore.component import querySubscriptions, queryMultiSubscriptions
+from grokcore.component import queryOrderedSubscriptions
+from grokcore.component import queryOrderedMultiSubscriptions
 from grokcore.component.decorators import subscribe, adapter, implementer
 from grokcore.component.directive import context, name, title, description
 from grokcore.component.directive import provides, direct

Modified: grok/trunk/src/grok/interfaces.py
===================================================================
--- grok/trunk/src/grok/interfaces.py	2011-09-05 18:49:51 UTC (rev 122730)
+++ grok/trunk/src/grok/interfaces.py	2011-09-06 20:53:26 UTC (rev 122731)
@@ -115,14 +115,17 @@
     ApplicationInitializedEvent = interface.Attribute("")
 
 
-class IGrokAPI(grokcore.formlib.interfaces.IGrokcoreFormlibAPI,
+class IGrokAPI(grokcore.component.interfaces.IGrokcoreComponentAPI,
+               grokcore.formlib.interfaces.IGrokcoreFormlibAPI,
                grokcore.layout.interfaces.IGrokcoreLayoutAPI,
                grokcore.security.interfaces.IGrokcoreSecurityAPI,
                grokcore.site.interfaces.IGrokcoreSiteAPI,
                grokcore.view.interfaces.IGrokcoreViewAPI,
                grokcore.viewlet.interfaces.IGrokcoreViewletAPI,
-               IGrokBaseClasses, IGrokDirectives,
-               IGrokEvents, IGrokErrors):
+               IGrokBaseClasses,
+               IGrokDirectives,
+               IGrokErrors,
+               IGrokEvents):
 
     # BBB this is deprecated
     def grok(dotted_name):