Changeset 145

Show
Ignore:
Timestamp:
05/08/02 10:19:14 (6 years ago)
Author:
sholloway
Message:

Renamed Base to JabberConnection?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/RBJabber/RBJabber/Client.py

    r144 r145  
    5050from Foundation.Jabber import ClientNodes 
    5151from Foundation.Jabber import JID 
    52 from Foundation.Jabber.Base import JabberConnection 
     52from Foundation.Jabber.JabberConnection import JabberConnection 
    5353from Foundation import SubjectObserver 
    5454 
     
    9090        self.information.jid = JID.JID() 
    9191        self.information.authorized = 0 
    92         apply(self.__super.__init__, (self,) + args, kw) 
     92        apply(self.__super.__init__, args, kw) 
    9393         
    9494        self.SupportedNS = [] 
     
    106106    def _SocketRecv(self, limit=8192): 
    107107        """Overrides socket access so that stream events can be created.""" 
    108         result = self.__super._SocketRecv(self, limit) 
     108        result = self.__super._SocketRecv(limit) 
    109109        if self.stream.IncludeRecv and result: self.stream.UpdateObservers(xmlrecv=result) 
    110110        return result 
     
    113113        """Overrides socket access so that stream events can be created.""" 
    114114        if self.stream.IncludeSend and data: self.stream.UpdateObservers(xmlsend=data) 
    115         return self.__super._SocketSend(self, data) 
     115        return self.__super._SocketSend(data) 
    116116 
    117117    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    121121    def Shutdown(self): 
    122122        """Politely disconnects the socket and parser from the jabber stream""" 
    123         self.__super.Shutdown(self
     123        self.__super.Shutdown(
    124124        self.information.jid = JID.JID() 
    125125        self.information.authorized = 0 
  • trunk/RBJabber/RBJabber/JabberConnection.py

    r144 r145  
    6161_xmlJabberHeader = '''<?xml version="1.0" encoding="UTF-8" ?><stream:stream to="%s" xmlns="%s" xmlns:stream="http://etherx.jabber.org/streams">''' 
    6262_xmlJabberFooter = '''</stream:stream>''' 
     63 
    6364 
    6465#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~