Changeset 409

Show
Ignore:
Timestamp:
01/20/03 20:08:03 (6 years ago)
Author:
sholloway
Message:

*** empty log message ***

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBTelepathy/RBTelepathy/Packet/StreamElements.py

    r408 r409  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
    26 from MessageElements import PacketElementBase 
     26from XMLMessageElements import PacketElementBase 
    2727 
    2828#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

  • trunk/RBTelepathy/RBTelepathy/Packet/__init__.py

    r408 r409  
    2727from RBFoundation import XMLClassBuilder 
    2828from RBFoundation.XMLObjectify import BaseObjectifiedXML, ObjectifiedXML 
    29 import Builder 
    30 import MessageElements 
    31 import StreamElements 
     29import XMLBuilder 
     30import XMLMessageElements 
     31import XMLStreamElements 
    3232 
    3333#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    …… 
    5757#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5858 
    59 class RootMessage(MessageElements.Message, XMLClassBuilder.XMLClassBuilderBaseMixin): 
     59class RootMessage(XMLMessageElements.Message, XMLClassBuilder.XMLClassBuilderBaseMixin): 
    6060    NamespaceSynonyms = StandardNamespaceSynonyms 
    6161    DefaultNamespace = NamespaceSynonyms[None] 
    6262    ElementFactories = XMLClassBuilder.ElementFactorySet({ 
    63             (RBMessagingNamespace, 'stream'): StreamElements.StreamFormatFactory(), 
    64             (RBMessagingNamespace, 'to'): EF.Static(MessageElements.URIAddressElement), 
    65             (RBMessagingNamespace, 'from'): EF.Static(MessageElements.URIAddressElement), 
     63            (RBMessagingNamespace, 'stream'): XMLStreamElements.StreamFormatFactory(), 
     64            (RBMessagingNamespace, 'to'): EF.Static(XMLMessageElements.URIAddressElement), 
     65            (RBMessagingNamespace, 'from'): EF.Static(XMLMessageElements.URIAddressElement), 
    6666            (RBMessagingNamespace, ): ChildELementErrorFactory(), 
    6767            None: EF.Static(ObjectifiedXML), 
    …… 
    7373#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    7474 
    75 class StandardStreamPacketBuilder(Builder.StreamPacketBuilder): 
     75class StandardStreamPacketBuilder(XMLBuilder.StreamPacketBuilder): 
    7676    NamespaceSynonyms = StandardNamespaceSynonyms 
    7777    DefaultNamespace = NamespaceSynonyms[None]