Changeset 417

Show
Ignore:
Timestamp:
01/23/03 21:36:14 (6 years ago)
Author:
sholloway
Message:

*** empty log message ***

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBTelepathy/RBTelepathy/Packet/AuthenticationHandler.py

    r415 r417  
    133133            raise ErrorTypes.AuthenticationError('Did not find selected response "simple"') 
    134134 
    135         if simple.addr.network: 
     135        if simple.addr.authority: 
    136136            connection.OnAuthenticated(True, simple.addr) 
    137137            self._reply_success(connection, packet, *args, **kw) 

  • trunk/RBTelepathy/RBTelepathy/Packet/URIAddress.py

    r406 r417  
    3232class URIAddress(URIAuthorityDefault): 
    3333    def _getAuthority(self): 
    34         if self.account is not None: 
     34        if self.network is not None: 
    3535            return '@'.join((self.account, self.network)) 
    36         else: return self.network 
     36        else: return self.account 
    3737 
    3838    def _setAuthority(self, value): 
    …… 
    4040            self.account, self.network = value.split('@', 1) 
    4141        except ValueError: 
    42             self.account = None 
    43             self.network = value 
     42            self.account = value 
     43            self.network = None 
    4444    authority = property(_getAuthority, _setAuthority) 
    4545