Mercurial > libervia-pubsub

diff sat_pubsub/tap.py @ 281:30895c49ebd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes the imports from sat.tmp
author souliane <souliane@mailoo.org>
date Wed, 14 Jan 2015 10:43:27 +0100
parents 798cb8962c0b
children 7d54ff2eeaf2
line wrap: on
line diff
--- a/sat_pubsub/tap.py	Fri Jan 09 10:57:10 2015 +0100
+++ b/sat_pubsub/tap.py	Wed Jan 14 10:43:27 2015 +0100
@@ -60,9 +60,9 @@
 from wokkel.disco import DiscoHandler
 from wokkel.generic import FallbackHandler, VersionHandler
 from wokkel.iwokkel import IPubSubResource
-from wokkel import pubsub, rsm
+from wokkel import pubsub, rsm, mam as wokkel_mam
 
-from sat_pubsub import __version__, const
+from sat_pubsub import __version__, const, mam
 from sat_pubsub.backend import BackendService
 from sat_pubsub.remote_roster import RosterClient
 
@@ -151,8 +151,8 @@
     bs.roster = rc
 
     if const.FLAG_ENABLE_MAM:
-        mam_resource = MAMResource()
-        mam_s = mam.MAMService(mam_resource)
+        mam_resource = mam.MAMResource()
+        mam_s = wokkel_mam.MAMService(mam_resource)
         mam_s.setHandlerParent(cs)
 
     return s