tmp (wokkel.pubsub): PubSubRequest class can be overriden everywhere, including PubSubClient
This commit is contained in:
parent
9c6d0fecc4
commit
831a00a604
1 changed files with 13 additions and 12 deletions
|
|
@ -759,9 +759,10 @@ class PubSubClient(XMPPHandler):
|
||||||
"""
|
"""
|
||||||
Publish subscribe client protocol.
|
Publish subscribe client protocol.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
implements(IPubSubClient)
|
implements(IPubSubClient)
|
||||||
|
|
||||||
|
_request_class = PubSubRequest
|
||||||
|
|
||||||
def connectionInitialized(self):
|
def connectionInitialized(self):
|
||||||
self.xmlstream.addObserver('/message/event[@xmlns="%s"]' %
|
self.xmlstream.addObserver('/message/event[@xmlns="%s"]' %
|
||||||
NS_PUBSUB_EVENT, self._onEvent)
|
NS_PUBSUB_EVENT, self._onEvent)
|
||||||
|
|
@ -841,7 +842,7 @@ class PubSubClient(XMPPHandler):
|
||||||
@param options: Optional node configuration options.
|
@param options: Optional node configuration options.
|
||||||
@type options: C{dict}
|
@type options: C{dict}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('create')
|
request = self._request_class('create')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.sender = sender
|
request.sender = sender
|
||||||
|
|
@ -874,7 +875,7 @@ class PubSubClient(XMPPHandler):
|
||||||
@param nodeIdentifier: The identifier of the node.
|
@param nodeIdentifier: The identifier of the node.
|
||||||
@type nodeIdentifier: C{unicode}
|
@type nodeIdentifier: C{unicode}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('delete')
|
request = self._request_class('delete')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.sender = sender
|
request.sender = sender
|
||||||
|
|
@ -903,7 +904,7 @@ class PubSubClient(XMPPHandler):
|
||||||
L{SubscriptionPending} or L{SubscriptionUnconfigured}.
|
L{SubscriptionPending} or L{SubscriptionUnconfigured}.
|
||||||
@rtype: L{defer.Deferred}
|
@rtype: L{defer.Deferred}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('subscribe')
|
request = self._request_class('subscribe')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.subscriber = subscriber
|
request.subscriber = subscriber
|
||||||
|
|
@ -950,7 +951,7 @@ class PubSubClient(XMPPHandler):
|
||||||
@param subscriptionIdentifier: Optional subscription identifier.
|
@param subscriptionIdentifier: Optional subscription identifier.
|
||||||
@type subscriptionIdentifier: C{unicode}
|
@type subscriptionIdentifier: C{unicode}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('unsubscribe')
|
request = self._request_class('unsubscribe')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.subscriber = subscriber
|
request.subscriber = subscriber
|
||||||
|
|
@ -970,7 +971,7 @@ class PubSubClient(XMPPHandler):
|
||||||
@param items: Optional list of L{Item}s to publish.
|
@param items: Optional list of L{Item}s to publish.
|
||||||
@type items: C{list}
|
@type items: C{list}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('publish')
|
request = self._request_class('publish')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.items = items
|
request.items = items
|
||||||
|
|
@ -1000,7 +1001,7 @@ class PubSubClient(XMPPHandler):
|
||||||
the results to the specific subscription.
|
the results to the specific subscription.
|
||||||
@type subscriptionIdentifier: C{unicode}
|
@type subscriptionIdentifier: C{unicode}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('items')
|
request = self._request_class('items')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
if maxItems:
|
if maxItems:
|
||||||
|
|
@ -1033,7 +1034,7 @@ class PubSubClient(XMPPHandler):
|
||||||
@param notify: True if notification is required
|
@param notify: True if notification is required
|
||||||
@type notify: C{unicode}
|
@type notify: C{unicode}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('retract')
|
request = self._request_class('retract')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.itemIdentifiers = itemIdentifiers
|
request.itemIdentifiers = itemIdentifiers
|
||||||
|
|
@ -1060,7 +1061,7 @@ class PubSubClient(XMPPHandler):
|
||||||
|
|
||||||
@rtype: L{data_form.Form}
|
@rtype: L{data_form.Form}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('optionsGet')
|
request = self._request_class('optionsGet')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.subscriber = subscriber
|
request.subscriber = subscriber
|
||||||
|
|
@ -1098,7 +1099,7 @@ class PubSubClient(XMPPHandler):
|
||||||
@param subscriptionIdentifier: Optional subscription identifier.
|
@param subscriptionIdentifier: Optional subscription identifier.
|
||||||
@type subscriptionIdentifier: C{unicode}
|
@type subscriptionIdentifier: C{unicode}
|
||||||
"""
|
"""
|
||||||
request = PubSubRequest('optionsSet')
|
request = self._request_class('optionsSet')
|
||||||
request.recipient = service
|
request.recipient = service
|
||||||
request.nodeIdentifier = nodeIdentifier
|
request.nodeIdentifier = nodeIdentifier
|
||||||
request.subscriber = subscriber
|
request.subscriber = subscriber
|
||||||
|
|
@ -1218,7 +1219,7 @@ class PubSubService(XMPPHandler, IQHandlerMixin):
|
||||||
|
|
||||||
info = []
|
info = []
|
||||||
|
|
||||||
request = PubSubRequest('discoInfo')
|
request = self._request_class('discoInfo')
|
||||||
|
|
||||||
if self.resource is not None:
|
if self.resource is not None:
|
||||||
resource = self.resource.locateResource(request)
|
resource = self.resource.locateResource(request)
|
||||||
|
|
@ -1250,7 +1251,7 @@ class PubSubService(XMPPHandler, IQHandlerMixin):
|
||||||
if self.hideNodes:
|
if self.hideNodes:
|
||||||
d = defer.succeed([])
|
d = defer.succeed([])
|
||||||
elif self.resource is not None:
|
elif self.resource is not None:
|
||||||
request = PubSubRequest('discoInfo')
|
request = self._request_class('discoInfo')
|
||||||
resource = self.resource.locateResource(request)
|
resource = self.resource.locateResource(request)
|
||||||
d = resource.getNodes(requestor, target, nodeIdentifier)
|
d = resource.getNodes(requestor, target, nodeIdentifier)
|
||||||
elif nodeIdentifier:
|
elif nodeIdentifier:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue