Mercurial > libervia-pubsub
comparison sat_pubsub/tap.py @ 281:30895c49ebd2
fixes the imports from sat.tmp
author | souliane <souliane@mailoo.org> |
---|---|
date | Wed, 14 Jan 2015 10:43:27 +0100 |
parents | 798cb8962c0b |
children | 7d54ff2eeaf2 |
comparison
equal
deleted
inserted
replaced
280:798cb8962c0b | 281:30895c49ebd2 |
---|---|
58 | 58 |
59 from wokkel.component import Component | 59 from wokkel.component import Component |
60 from wokkel.disco import DiscoHandler | 60 from wokkel.disco import DiscoHandler |
61 from wokkel.generic import FallbackHandler, VersionHandler | 61 from wokkel.generic import FallbackHandler, VersionHandler |
62 from wokkel.iwokkel import IPubSubResource | 62 from wokkel.iwokkel import IPubSubResource |
63 from wokkel import pubsub, rsm | 63 from wokkel import pubsub, rsm, mam as wokkel_mam |
64 | 64 |
65 from sat_pubsub import __version__, const | 65 from sat_pubsub import __version__, const, mam |
66 from sat_pubsub.backend import BackendService | 66 from sat_pubsub.backend import BackendService |
67 from sat_pubsub.remote_roster import RosterClient | 67 from sat_pubsub.remote_roster import RosterClient |
68 | 68 |
69 | 69 |
70 class Options(usage.Options): | 70 class Options(usage.Options): |
149 rc = RosterClient() | 149 rc = RosterClient() |
150 rc.setHandlerParent(cs) | 150 rc.setHandlerParent(cs) |
151 bs.roster = rc | 151 bs.roster = rc |
152 | 152 |
153 if const.FLAG_ENABLE_MAM: | 153 if const.FLAG_ENABLE_MAM: |
154 mam_resource = MAMResource() | 154 mam_resource = mam.MAMResource() |
155 mam_s = mam.MAMService(mam_resource) | 155 mam_s = wokkel_mam.MAMService(mam_resource) |
156 mam_s.setHandlerParent(cs) | 156 mam_s.setHandlerParent(cs) |
157 | 157 |
158 return s | 158 return s |