[Checkins] SVN: grokcore.component/branches/sylvain-subscribers/ rename Subscriber --> Subscription
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Mon Jan 31 05:34:54 EST 2011
Log message for revision 120016:
rename Subscriber --> Subscription
Changed:
U grokcore.component/branches/sylvain-subscribers/README.txt
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/__init__.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/components.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/interfaces.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/meta.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/decorator.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/multisubscribers.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_multisubscribers.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_subscribers.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_context.py
U grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_interface.py
-=-
Modified: grokcore.component/branches/sylvain-subscribers/README.txt
===================================================================
--- grokcore.component/branches/sylvain-subscribers/README.txt 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/README.txt 2011-01-31 10:34:53 UTC (rev 120016)
@@ -173,34 +173,34 @@
class ISchema(Interface):
"""This schema will be used to power a z3c.form form"""
-
+
field = zope.schema.TextLine(title=u"Sample field")
-
+
...
label_override = z3c.form.widget.StaticWidgetAttribute(
u"Override label", field=ISchema['field'])
-
+
grokcore.component.global_adapter(label_override, name=u"label")
-
+
In the example above, the provided and adapted interfaces are deduced from the
object returned by the ``StaticWidgetAttribute`` factory. The full syntax
for global_adapter is::
global_adapter(factory, (IAdapted1, IAdapted2,), IProvided, name=u"name")
-
+
The factory must be a callable (the adapter factory). Adapted interfaces are
given as a tuple. You may use a single interface instead of a one-element
tuple for single adapters. The provided interface is given as shown. The name
defaults to u"" (an unnamed adapter).
-Subscriber
-----------
+Handling events
+---------------
-Here we see a subscriber much like it occurs within Zope itself. It
-subscribes to the modified event for all annotatable objects (in other
-words, objects that can have metadata associated with them). When
-invoked, it updates the Dublin Core 'Modified' property accordingly::
+Here we see an event handler much like it occurs within Zope itself. It
+subscribes to the modified event for all annotatable objects (in other words,
+objects that can have metadata associated with them). When invoked, it updates
+the Dublin Core 'Modified' property accordingly::
import datetime
import grokcore.component
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/__init__.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/__init__.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/__init__.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -22,8 +22,8 @@
from martian import ClassGrokker, InstanceGrokker, GlobalGrokker
from grokcore.component.components import (
- Adapter, GlobalUtility, MultiAdapter, Context, Subscriber,
- MultiSubscriber)
+ Adapter, GlobalUtility, MultiAdapter, Context, Subscription,
+ MultiSubscription)
from grokcore.component.directive import (
context, description, direct, name, order, path, provides, title,
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/components.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/components.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/components.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -47,16 +47,16 @@
pass
-class Subscriber(object):
- """Base class for a subscriber.
+class Subscription(object):
+ """Base class for a subscription adapter.
"""
def __init__(self, context):
self.context = context
-class MultiSubscriber(object):
- """Base class for a multi-subcriber.
+class MultiSubscription(object):
+ """Base class for a subscription multi-adapter.
"""
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/interfaces.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/interfaces.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/interfaces.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -44,8 +44,9 @@
Adapter = Attribute("Base class for adapters.")
MultiAdapter = Attribute("Base class for multi-adapters.")
GlobalUtility = Attribute("Base class for global utilities.")
- Subscriber = Attribute("Base class for subscribers.")
- MultiSubscriber = Attribute("Base class for multi-subscribers.")
+ Subscription = Attribute("Base class for subscription adapters.")
+ MultiSubscription = Attribute(
+ "Base class for subscription mult-adapters.")
class IDirectives(Interface):
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/meta.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/meta.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/meta.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -69,8 +69,8 @@
return True
-class SubscriberGrokker(martian.ClassGrokker):
- martian.component(grokcore.component.Subscriber)
+class SubscriptionGrokker(martian.ClassGrokker):
+ martian.component(grokcore.component.Subscription)
martian.directive(grokcore.component.context)
martian.directive(grokcore.component.provides)
martian.directive(grokcore.component.name)
@@ -84,8 +84,8 @@
return True
-class MultiSubscriberGrokker(martian.ClassGrokker):
- martian.component(grokcore.component.MultiSubscriber)
+class MultiSubscriptionGrokker(martian.ClassGrokker):
+ martian.component(grokcore.component.MultiSubscription)
martian.directive(grokcore.component.provides)
martian.directive(grokcore.component.name)
@@ -222,10 +222,10 @@
if len(implemented) == 1:
provides = implemented[0]
# provideHandler is essentially the same as
- # provideSubscriptionAdapter, where
- # provided=None. However, handlers and subscription
- # adapters are tracked in separately so we cannot exchange
- # one registration call for the the other.
+ # provideSubscriptionAdapter, where provided=None. However,
+ # handlers and subscription adapters are tracked in
+ # separately so we cannot exchange one registration call
+ # for the the other.
if provides is None:
config.action(
discriminator=None,
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/decorator.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/decorator.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/decorator.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -7,7 +7,7 @@
>>> subscribers
[<grokcore.component.tests.subscriber.decorator.DebuggingGrokcore object at ...>]
- Subscribers are not registered as adapters:
+ Subscripotion adapters are not registered as regular adapters:
>>> component.queryAdapter(cave, IActivity)
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/multisubscribers.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/multisubscribers.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/multisubscribers.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -60,7 +60,7 @@
"""Do something.
"""
-class Sleep(grok.MultiSubscriber):
+class Sleep(grok.MultiSubscription):
grok.implements(IActivity)
grok.adapts(Office, Mammoth)
@@ -72,7 +72,7 @@
print '%s is sleeping at %s.' % (self.who.name, self.where.name)
-class DayTimeActivity(grok.MultiSubscriber):
+class DayTimeActivity(grok.MultiSubscription):
grok.implements(IActivity)
grok.adapts(Cave, Mammoth)
grok.baseclass()
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_multisubscribers.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_multisubscribers.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_multisubscribers.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -61,7 +61,7 @@
"""
-class DayTimeActivity(grok.MultiSubscriber):
+class DayTimeActivity(grok.MultiSubscription):
grok.provides(IActivity)
grok.adapts(Cave, Mammoth)
grok.baseclass()
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_subscribers.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_subscribers.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/ordered_subscribers.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -46,7 +46,7 @@
"""Clean that cave.
"""
-class MondayCleaner(grok.Subscriber):
+class MondayCleaner(grok.Subscription):
grok.implements(ICleaner)
grok.order(1)
@@ -54,7 +54,7 @@
print 'Monday cleaning!'
-class WednesdayCleaner(grok.Subscriber):
+class WednesdayCleaner(grok.Subscription):
grok.implements(ICleaner)
grok.order(3)
@@ -62,7 +62,7 @@
print 'Wednesday cleaning!'
-class SaturdayCleaner(grok.Subscriber):
+class SaturdayCleaner(grok.Subscription):
grok.implements(ICleaner)
grok.order(6)
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -14,7 +14,7 @@
Saturday cleaning sweet home!
Wednesday cleaning sweet home!
- Subscribers are not registered as adapters:
+ Subscription adapters are not registered as regular adapters:
>>> component.queryAdapter(cave, ICleaner)
@@ -36,21 +36,21 @@
"""Clean that cave.
"""
-class MondayCleaner(grok.Subscriber):
+class MondayCleaner(grok.Subscription):
grok.implements(ICleaner)
def work(self):
print 'Monday cleaning %s!' % self.context.name
-class WednesdayCleaner(grok.Subscriber):
+class WednesdayCleaner(grok.Subscription):
grok.provides(ICleaner)
def work(self):
print 'Wednesday cleaning %s!' % self.context.name
-class SaturdayCleaner(grok.Subscriber):
+class SaturdayCleaner(grok.Subscription):
grok.implements(ICleaner)
def work(self):
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_context.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_context.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_context.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -16,5 +16,5 @@
def finish():
pass
-class CaveProcessor(grok.Subscriber):
+class CaveProcessor(grok.Subscription):
grok.provides(ITask)
Modified: grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_interface.py
===================================================================
--- grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_interface.py 2011-01-31 10:24:34 UTC (rev 120015)
+++ grokcore.component/branches/sylvain-subscribers/src/grokcore/component/tests/subscriber/subscribers_no_interface.py 2011-01-31 10:34:53 UTC (rev 120016)
@@ -13,5 +13,5 @@
class Cave(grok.Context):
pass
-class CaveProcessor(grok.Subscriber):
+class CaveProcessor(grok.Subscription):
pass
More information about the checkins
mailing list