# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1421228689 -3600
# Node ID ed2c718bfe031d8a3ad41ffe94fd57a1f76b56e1
# Parent  41ffe2c2dddc0df9c43b436b4c803d2619e2ca64
tmp, plugins: fixes the imports fron sat.tmp

diff -r 41ffe2c2dddc -r ed2c718bfe03 src/plugins/__init__.py
--- a/src/plugins/__init__.py	Fri Jan 09 10:51:12 2015 +0100
+++ b/src/plugins/__init__.py	Wed Jan 14 10:44:49 2015 +0100
@@ -1,7 +1,7 @@
+# TODO: remove this when RSM and MAM are in wokkel
 import wokkel
-from sat.tmp.wokkel import delay, pubsub, rsm, mam
-
-wokkel.delay = delay
-wokkel.pubsub = pubsub
-wokkel.rsm = rsm
-wokkel.mam = mam
+from sat.tmp.wokkel import delay as tmp_delay, pubsub as tmp_pubsub, rsm as tmp_rsm, mam as tmp_mam
+wokkel.delay = tmp_delay
+wokkel.pubsub = tmp_pubsub
+wokkel.rsm = tmp_rsm
+wokkel.mam = tmp_mam
diff -r 41ffe2c2dddc -r ed2c718bfe03 src/plugins/plugin_xep_0313.py
--- a/src/plugins/plugin_xep_0313.py	Fri Jan 09 10:51:12 2015 +0100
+++ b/src/plugins/plugin_xep_0313.py	Wed Jan 14 10:44:49 2015 +0100
@@ -32,10 +32,13 @@
 
 from zope.interface import implements
 
-from wokkel import disco, data_form, mam
-from wokkel.rsm import RSMRequest
+from wokkel import disco, data_form
 from wokkel.generic import parseXml
 
+# TODO: change this when RSM and MAM are in wokkel
+from sat.tmp.wokkel.rsm import RSMRequest
+from sat.tmp.wokkel import mam
+
 
 NS_MAM = 'urn:xmpp:mam:0'
 NS_SF = 'urn:xmpp:forward:0'
diff -r 41ffe2c2dddc -r ed2c718bfe03 src/test/test_plugin_xep_0313.py
--- a/src/test/test_plugin_xep_0313.py	Fri Jan 09 10:51:12 2015 +0100
+++ b/src/test/test_plugin_xep_0313.py	Wed Jan 14 10:44:49 2015 +0100
@@ -27,8 +27,10 @@
 from twisted.words.xish import domish
 from dateutil.tz import tzutc
 import datetime
-from wokkel.rsm import RSMRequest
-from wokkel.mam import buildForm
+
+# TODO: change this when RSM and MAM are in wokkel
+from sat.tmp.wokkel.rsm import RSMRequest
+from sat.tmp.wokkel.mam import buildForm
 
 NS_PUBSUB = 'http://jabber.org/protocol/pubsub'
 SERVICE = 'sat-pubsub.tazar.int'
diff -r 41ffe2c2dddc -r ed2c718bfe03 src/tmp/wokkel/mam.py
--- a/src/tmp/wokkel/mam.py	Fri Jan 09 10:51:12 2015 +0100
+++ b/src/tmp/wokkel/mam.py	Wed Jan 14 10:44:49 2015 +0100
@@ -16,8 +16,8 @@
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber import jid
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
-from wokkel import disco, rsm, data_form
-
+from wokkel import disco, data_form
+import rsm
 
 NS_MAM = 'urn:xmpp:mam:0'