erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tmp, plugins: fixes the imports fron sat.tmp

Browse source
This commit is contained in:
souliane 2015-01-14 10:44:49 +01:00
commit 1a1deb5056
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/plugins/__init__.py
View file

@ -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

7
src/plugins/plugin_xep_0313.py
View file

@ -32,10 +32,13 @@ from twisted.words.protocols.jabber import jid
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'