Changeset 756 for trunk/RBJabber

Show
Ignore:
Timestamp:
04/13/04 16:10:13 (4 years ago)
Author:
sholloway
Message:

Revised the inheritence from RBFoundation changes

Files:

Legend:

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

    r528 r756  
    3737#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    3838 
    39 from RBFoundation.XMLBuilder import XMLBuilderObjectBase 
    40 from RBFoundation.XMLClassBuilder import XMLClassBuilderMixin 
     39from RBFoundation.XMLClassBuilder import XMLClassBuilder 
    4140from RBFoundation import SmartSelect 
    4241from RBFoundation.BindCallable import BindCallable 
     
    5049#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5150 
    52 _xmlJabberHeader = '''<?xml version="1.0" encoding="UTF-8" ?><stream:stream to="%s" xmlns="%s" xmlns:stream="http://etherx.jabber.org/streams">''
    53 _xmlJabberFooter = '''</stream:stream>''
     51_xmlJabberHeader = '<?xml version="1.0" encoding="UTF-8" ?><stream:stream to="%s" xmlns="%s" xmlns:stream="http://etherx.jabber.org/streams">
     52_xmlJabberFooter = '</stream:stream>
    5453 
    5554 
     
    5857#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5958 
    60 class JabberConnection(XMLClassBuilderMixin, SmartSelect.SmartSelectClientBase): 
     59class JabberConnection(XMLClassBuilder, SmartSelect.SmartSelectClientBase): 
    6160    """Very basic Jabber client, including: 
    6261        - Smart select socket handling,  
     
    7978    def __init__(self, *args, **kw): 
    8079        # Base code 
    81         XMLClassBuilderMixin.__init__(self) 
     80        XMLClassBuilder.__init__(self) 
    8281 
    8382        if args or kw: