comparison src/core/xmpp.py @ 1564:001b62bed67c

core (xmpp.py): fixed bad import
author Goffi <goffi@goffi.org>
date Fri, 06 Nov 2015 17:09:42 +0100
parents 591c32dbfb0b
children 6338677f3a89
comparison
equal deleted inserted replaced
1563:075a63180eab 1564:001b62bed67c
25 from sat.core.log import getLogger 25 from sat.core.log import getLogger
26 log = getLogger(__name__) 26 log = getLogger(__name__)
27 from sat.core import exceptions 27 from sat.core import exceptions
28 from calendar import timegm 28 from calendar import timegm
29 from zope.interface import implements 29 from zope.interface import implements
30 try: 30 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
31 from twisted.words.protocols.xmlstream import XMPPHandler
32 except ImportError:
33 from wokkel.subprotocols import XMPPHandler
34 31
35 32
36 class SatXMPPClient(client.XMPPClient): 33 class SatXMPPClient(client.XMPPClient):
37 implements(iwokkel.IDisco) 34 implements(iwokkel.IDisco)
38 35