Ignore:
Timestamp:
Jan 22, 2012, 2:51:25 PM (10 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
default
Message:

Cleanups leading up to Wokkel 0.7.0.

As we now depend on Twisted 10.0.0 or higher, the following classes and
interfaces were deprecated:

This also resolves all Pyflakes warnings, changes links for www.xmpp.org to
xmpp.org and fixes the copyright notice in LICENSE to include 2012.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wokkel/server.py

    r96 r165  
    2424from zope.interface import implements
    2525
    26 from twisted.application import service
    2726from twisted.internet import defer, reactor
    2827from twisted.names.srvconnect import SRVConnector
     
    3231
    3332from wokkel.generic import DeferredXmlStreamFactory, XmlPipe
    34 from wokkel.compat import XmlStreamServerFactory
    3533
    3634NS_DIALBACK = 'jabber:server:dialback'
     
    4139
    4240    The dialback key is generated using the algorithm described in
    43     U{XEP-0185<http://www.xmpp.org/extensions/xep-0185.html>}. The used
     41    U{XEP-0185<http://xmpp.org/extensions/xep-0185.html>}. The used
    4442    terminology for the parameters is described in RFC-3920.
    4543
     
    478476
    479477
    480 class XMPPS2SServerFactory(XmlStreamServerFactory):
     478class XMPPS2SServerFactory(xmlstream.XmlStreamServerFactory):
    481479    """
    482480    XMPP Server-to-Server Server factory.
     
    493491            return XMPPServerListenAuthenticator(service)
    494492
    495         XmlStreamServerFactory.__init__(self, authenticatorFactory)
     493        xmlstream.XmlStreamServerFactory.__init__(self, authenticatorFactory)
    496494        self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT,
    497495                          self.onConnectionMade)
     
    702700            try:
    703701                sender = jid.internJID(stanzaFrom)
    704                 recipient = jid.internJID(stanzaTo)
     702                jid.internJID(stanzaTo)
    705703            except jid.InvalidFormat:
    706704                log.msg("Dropping error stanza with malformed JID")
Note: See TracChangeset for help on using the changeset viewer.