Changeset 463

Show
Ignore:
Timestamp:
02/28/03 00:10:31 (6 years ago)
Author:
sholloway
Message:

*** empty log message ***

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/RBFoundation/RBFoundation/XMLClassBuilder.py

    r445 r463  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
     26from __future__ import generators 
    2627import XMLBuilder 
    2728import keyword 
     
    187188 
    188189    def copy(self): 
    189         return ElementFactorySet(dict.copy(self)) 
     190        return self.__class__(dict.copy(self)) 
    190191 
    191192    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    192193    #~ Protected Methods  
    193194    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     195 
     196    def _GetElementFactoryIndices(self, node): 
     197        idx = node 
     198        while idx: 
     199            yield idx 
     200            idx = idx[:-1] 
     201        yield None 
    194202 
    195203    def _GetElementFactory(self, owner, parent, node, attributes, namespacemap): 
    196204        try: 
    197             idx = node 
    198             while idx: 
    199                 FactoryFactory = self.get(idx, None) 
    200                 if FactoryFactory: 
     205            for idx in self._GetElementFactoryIndices(node): 
     206                FactoryFactory = self.get(idx) 
     207                if FactoryFactory is not None: 
    201208                    result = FactoryFactory(owner, parent, node, attributes, namespacemap) 
    202209                    if result:  
    203210                        return result 
    204                 idx = idx[:-1] 
    205  
    206             # Resort to the default 
    207             FactoryFactory = self.get(None, None) 
    208             if FactoryFactory: 
    209                 result = FactoryFactory(owner, parent, node, attributes, namespacemap) 
    210                 if result:  
    211                     return result 
    212              
    213211        except ElementFactory.InheritFromNextFactory, (args, kw): 
    214212            if self.NextFactorySet: 
  • trunk/RBMessaging/RBMessaging/Client/Handlers/Authentication.py

    r459 r463  
    2525 
    2626from RBTelepathy.Handlers import * 
    27 from RBMessaging.Packet import RBNamespace 
    2827 
    2928#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    4746class method(Elements.PacketElement, XMLClassBuilderObjectMixin): 
    4847    __slots__ = [] 
    49     NamespaceSynonyms = {None: RBNamespace} 
    50     DefaultNamespace = NamespaceSynonyms[None] 
    51     ElementFactories = ElementFactorySet({ 
    52             (RBNamespace, 'response'): Elements.Factory(Elements.PacketElement), 
    53             (RBNamespace, 'challenge'): Elements.Factory(Elements.PacketElement), 
     48    ElementFactories = PacketFactorySet({ 
     49        'response': Elements.Factory(Elements.PacketElement), 
     50        'challenge': Elements.Factory(Elements.PacketElement), 
    5451        }) 
    5552 
     
    9289class authentication(Elements.RootElementBase, XMLClassBuilderObjectMixin): 
    9390    __slots__ = [] 
    94     NamespaceSynonyms = {None: RBNamespace} 
    95     DefaultNamespace = NamespaceSynonyms[None] 
    96     ElementFactories = ElementFactorySet({ 
    97             (RBNamespace, 'as'): Elements.Factory(Elements.URIAddressElement), 
    98             (RBNamespace, 'method'): Elements.Factory(method), 
     91    ElementFactories = PacketFactorySet({ 
     92        'as': Elements.Factory(Elements.URIAddressElement), 
     93        'method': Elements.Factory(method), 
    9994        }) 
    10095 
     
    106101    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    107102 
    108     ElementFactories = {(RBNamespace, 'authentication'): Elements.RootFactory(authentication)} 
     103    ElementFactories = {'authentication': Elements.RootFactory(authentication)} 
    109104    StreamPacketHandlers = ElementFactories.keys() 
    110105 
     
    177172 
    178173    def _reply_response(self, packet, *args, **kw): 
    179         packet = authentication(namespace=RBNamespace
     174        packet = authentication(
    180175        packet.attrs['type'] = 'response' 
    181176        packet += 'as', 
  • trunk/RBMessaging/RBMessaging/Client/Handlers/Error.py

    r459 r463  
    2525 
    2626from RBTelepathy.Handlers import * 
    27 from RBMessaging.Packet import RBNamespace 
    2827 
    2928#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    3332class error(Elements.RootElementBase, XMLClassBuilderObjectMixin): 
    3433    __slots__ = [] 
    35     NamespaceSynonyms = {None: RBNamespace} 
    36     DefaultNamespace = NamespaceSynonyms[None] 
    37     ElementFactories = ElementFactorySet({ 
    38             (RBNamespace, ): Elements.Factory(Elements.PacketElement), 
     34    ElementFactories = PacketFactorySet({ 
     35        None: Elements.Factory(Elements.PacketElement), 
    3936        }) 
    4037 
     
    4643    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    4744 
    48     ElementFactories = {(RBNamespace, 'error'): Elements.RootFactory(error)} 
     45    ElementFactories = {'error': Elements.RootFactory(error)} 
    4946    StreamPacketHandlers = ElementFactories.keys() 
    5047 
  • trunk/RBMessaging/RBMessaging/Client/Handlers/Message.py

    r461 r463  
    2525 
    2626from RBTelepathy.Handlers import * 
    27 from RBMessaging.Packet import RBNamespace 
    2827import copy 
    2928 
     
    3837 
    3938    __slots__ = [] 
    40     NamespaceSynonyms = {None: RBNamespace} 
    41     DefaultNamespace = NamespaceSynonyms[None] 
    42     ElementFactories = ElementFactorySet({ 
    43             (RBNamespace, 'to'): Elements.Factory(Elements.URIAddressElement), 
    44             (RBNamespace, 'from'): Elements.Factory(Elements.URIAddressElement), 
    45             (RBNamespace, 'stream'): StreamElements.StreamFormatFactory(), 
    46             (RBNamespace, ): Elements.Factory(Elements.PacketElement), 
     39    ElementFactories = PacketFactorySet({ 
     40            'to': Elements.Factory(Elements.URIAddressElement), 
     41            'from': Elements.Factory(Elements.URIAddressElement), 
     42            'stream': StreamElements.StreamFormatFactory(), 
    4743            None: Elements.Factory(Elements.PacketElement), 
    4844        }) 
    49     default_namespaces = Elements.StreamRootElement.default_namespaces.copy() 
    50     default_namespaces.setxmlns('', RBNamespace) 
    5145 
    5246    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    5549 
    5650    def GetAddresses(self, nodename='to'): 
    57         existing = self.iternodes(nodename, RBNamespace
     51        existing = self.iternodes(nodename
    5852        result = [each.addr for each in existing] 
    5953        return result 
     
    6963    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    7064 
    71     ElementFactories = {(RBNamespace, 'message'): Elements.RootFactory(message)} 
     65    ElementFactories = {'message': Elements.RootFactory(message)} 
    7266    StreamPacketHandlers = ElementFactories.keys() 
    7367 
     
    8074    def __init__(self, connection): 
    8175        self.connection = connection 
    82         router = connection.model().Routers.get((RBNamespace, 'message'), None) 
    8376 
    8477    def OnRoutedPacket(self, packet, addresses): 
  • trunk/RBMessaging/RBMessaging/Host/Handlers/Authentication.py

    r459 r463  
    2525 
    2626from RBTelepathy.Handlers import * 
    27 from RBMessaging.Packet import RBNamespace 
    2827 
    2928#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    3332class AuthBaseMethod(Elements.PacketElement, XMLClassBuilderObjectMixin): 
    3433    __slots__ = [] 
    35     NamespaceSynonyms = {None: RBNamespace} 
    36     DefaultNamespace = NamespaceSynonyms[None] 
    37     ElementFactories = ElementFactorySet({ 
    38             (RBNamespace, 'response'): Elements.Factory(Elements.PacketElement), 
    39             (RBNamespace, 'challenge'): Elements.Factory(Elements.PacketElement), 
     34    ElementFactories = PacketFactorySet({ 
     35            'response': Elements.Factory(Elements.PacketElement), 
     36            'challenge': Elements.Factory(Elements.PacketElement), 
    4037        }) 
    4138 
     
    118115class authentication(Elements.RootElementBase, XMLClassBuilderObjectMixin): 
    119116    __slots__ = [] 
    120     NamespaceSynonyms = {None: RBNamespace} 
    121     DefaultNamespace = NamespaceSynonyms[None] 
    122     ElementFactories = ElementFactorySet({ 
    123             (RBNamespace, 'as'): Elements.Factory(Elements.URIAddressElement), 
    124             (RBNamespace, 'method'): Elements.Factory(DefaultAuthMethod), 
     117    ElementFactories = PacketFactorySet({ 
     118        'as': Elements.Factory(Elements.URIAddressElement), 
     119        'method': Elements.Factory(DefaultAuthMethod), 
    125120        }) 
    126121 
     
    132127    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    133128 
    134     ElementFactories = {(RBNamespace, 'authentication'): Elements.RootFactory(authentication)} 
     129    ElementFactories = {'authentication': Elements.RootFactory(authentication)} 
    135130    StreamPacketHandlers = ElementFactories.keys() 
    136131 
  • trunk/RBMessaging/RBMessaging/Host/Handlers/Error.py

    r459 r463  
    2525 
    2626from RBTelepathy.Handlers import * 
    27 from RBMessaging.Packet import RBNamespace 
    2827 
    2928#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    3332class error(Elements.RootElementBase, XMLClassBuilderObjectMixin): 
    3433    __slots__ = [] 
    35     NamespaceSynonyms = {None: RBNamespace} 
    36     DefaultNamespace = NamespaceSynonyms[None] 
    37     ElementFactories = ElementFactorySet({ 
    38             (RBNamespace, ): Elements.Factory(Elements.PacketElement), 
     34    ElementFactories = PacketFactorySet({ 
     35        None: Elements.Factory(Elements.PacketElement), 
    3936        }) 
    4037 
     
    4643    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    4744 
    48     ElementFactories = {(RBNamespace, 'error'): Elements.RootFactory(error)} 
     45    ElementFactories = {'error': Elements.RootFactory(error)} 
    4946    StreamPacketHandlers = ElementFactories.keys() 
    5047 
  • trunk/RBMessaging/RBMessaging/Host/Handlers/Message.py

    r459 r463  
    2525 
    2626from RBTelepathy.Handlers import * 
    27 from RBMessaging.Packet import RBNamespace 
    2827import copy 
    2928 
     
    3837 
    3938    __slots__ = [] 
    40     NamespaceSynonyms = {None: RBNamespace} 
    41     DefaultNamespace = NamespaceSynonyms[None] 
    42     ElementFactories = ElementFactorySet({ 
    43             (RBNamespace, 'to'): Elements.Factory(Elements.URIAddressElement), 
    44             (RBNamespace, 'from'): Elements.Factory(Elements.URIAddressElement), 
    45             (RBNamespace, 'stream'): StreamElements.StreamFormatFactory(), 
    46             (RBNamespace, ): Elements.Factory(Elements.PacketElement), 
     39    ElementFactories = PacketFactorySet({ 
     40            'to': Elements.Factory(Elements.URIAddressElement), 
     41            'from': Elements.Factory(Elements.URIAddressElement), 
     42            'stream': StreamElements.StreamFormatFactory(), 
    4743            None: Elements.Factory(Elements.PacketElement), 
    4844        }) 
    49     default_namespaces = Elements.StreamRootElement.default_namespaces .copy() 
    50     default_namespaces.setxmlns('', RBNamespace) 
    5145 
    5246    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    6963    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    7064 
    71     ElementFactories = {(RBNamespace, 'message'): Elements.RootFactory(message)} 
     65    ElementFactories = {'message': Elements.RootFactory(message)} 
    7266    StreamPacketHandlers = ElementFactories.keys() 
    7367 
     
    8074    def __init__(self, connection): 
    8175        self.connection = connection 
    82         self.router = connection.model().GetRouter((RBNamespace, 'message')
     76        self.router = connection.model().GetRouter('message'
    8377        if self.router: 
    8478            key = connection.loginaddr.authority 
     
    10296        self.log.info('Sending "%s" packet to Router', packet.node) 
    10397        if not self.router: 
    104             self.router = connection.model().GetRouter((RBNamespace, 'message')
     98            self.router = connection.model().GetRouter('message'
    10599            if not self.router: 
    106100                raise ErrorTypes.RoutingError, 'No router available' 
  • trunk/RBMessaging/RBMessaging/Model.py

    r459 r463  
    3232from RBTelepathy import SocketConnections 
    3333 
    34 from RBMessaging.Packet import RBNamespace 
    35  
    3634from Router import SimpleRouter 
    3735import Client.Connection 
     
    5048        self.Connections = {} 
    5149        self.Routers = {} 
    52         self.Routers[(RBNamespace, 'message')] = SimpleRouter.AuthorityDictRouter() 
     50        self.Routers['message'] = SimpleRouter.AuthorityDictRouter() 
    5351 
    5452    def GetRouter(self, key): 
     
    9593    try: 
    9694        model = Model() 
    97         model.Serve(None
    98         send = model.Connect(None).Login('send') 
     95        model.Serve(
     96        send = model.Connect().Login('send') 
    9997        while not getattr(send, 'loginaddr', None): 
    10098            model.Process(0.1) 
    101         recv = model.Connect(None).Login('recv') 
     99        recv = model.Connect().Login('recv') 
    102100        while not getattr(recv, 'loginaddr', None): 
    103101            model.Process(0.1) 
  • trunk/RBMessaging/RBMessaging/Packet/__init__.py

    r459 r463  
    3131 
    3232#RBNamespace = 'http://namespaces.runeblade.com/RBMessaging' 
    33 RBNamespace = 'RBM
     33RBNamespace = 'RBMessaging
    3434 
    3535RBNamespaceSynonyms = { 
  • trunk/RBMessaging/demo/simple/host.py

    r462 r463  
    3838    try: 
    3939        model = Model() 
    40         model.Serve(None
     40        model.Serve(
    4141        while 1: model.Process(0.1) 
    4242    except KeyboardInterrupt: 
  • trunk/RBMessaging/demo/simple/recv.py

    r462 r463  
    3838    try: 
    3939        model = Model() 
    40         recv = model.Connect(None).Login('recv') 
     40        recv = model.Connect().Login('recv') 
    4141        while 1: 
    4242            model.Process(0.1) 
  • trunk/RBMessaging/demo/simple/send.py

    r462 r463  
    3838    try: 
    3939        model = Model() 
    40         send = model.Connect(None).Login('send') 
     40        send = model.Connect().Login('send') 
    4141        while not getattr(send, 'loginaddr', None): 
    4242            model.Process(0.1) 
  • trunk/RBTelepathy/RBTelepathy/Connection.py

    r459 r463  
    4141#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    4242 
     43from __future__ import generators 
    4344import logging 
    4445import weakref 
     
    117118 
    118119        # Lookup our packet handler 
    119         packethandler = self.RoutedPacketHandlers.get((packet.namespace, packet.node), None) 
    120         if packethandler is None: 
    121             packethandler = self.RoutedPacketHandlers.get((packet.namespace, ), None) 
    122         if packethandler is None: 
    123             packethandler = self.RoutedPacketHandlers.get(None, None) 
    124         if packethandler is None: 
     120        for nodeidx in self._GetPacketHandlerIndices((packet.namespace, packet.node)): 
     121            packethandler = self.RoutedPacketHandlers.get(nodeidx, None) 
     122            if packethandler is not None: break 
     123        else: 
    125124            raise ErrorTypes.RoutedHandlerError("No RoutedPacketHandler for (%s, %s)" % (packet.namespace, packet.node)) 
    126125 
     
    131130 
    132131        # Lookup our packet handler 
    133         packethandler = self.StreamPacketHandlers.get((packet.namespace, packet.node), None) 
    134         if packethandler is None: 
    135             packethandler = self.StreamPacketHandlers.get((packet.namespace, ), None) 
    136         if packethandler is None: 
    137             packethandler = self.StreamPacketHandlers.get(None, None) 
    138         if packethandler is None: 
     132        for nodeidx in self._GetPacketHandlerIndices((packet.namespace, packet.node)): 
     133            packethandler = self.StreamPacketHandlers.get(nodeidx, None) 
     134            if packethandler is not None: break 
     135        else: 
    139136            raise ErrorTypes.PacketHandlerError("No StreamPacketHandler for (%s, %s)" % (packet.namespace, packet.node)) 
    140137 
     
    144141        self.log.debug('Stream shutdown by "%s"', how) 
    145142 
     143    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     144    #~ Protected Methods  
     145    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     146 
     147    def _GetPacketHandlerIndices(self, (namespace, node)): 
     148        yield (namespace, node) 
     149        yield (namespace, ) 
     150        yield node 
     151        yield None 
     152 
  • trunk/RBTelepathy/RBTelepathy/Handlers/__init__.py

    r458 r463  
    4040            None: 'the default namespace when one is not specified'} 
    4141        DefaultNamespace = NamespaceSynonyms[None] 
    42         ElementFactories = ElementFactorySet({ 
     42        ElementFactories = PacketFactorySet({ 
    4343                (namespace, node0): ElementFactory(...), # Specific (namespace, node) 
    4444                (namespace, nodeN): ElementFactory(...), # Specific (namespace, node) 
  • trunk/RBTelepathy/RBTelepathy/Packet/Builder.py

    r455 r463  
    2424#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2525 
     26from __future__ import generators 
    2627import weakref 
    27 from __init__ import RBNamespaceSynonyms 
    2828from xml.parsers.expat import ExpatError 
    29 from RBFoundation.XMLClassBuilder import * 
    30 from RBFoundation.XMLClassBuilder import ElementFactory as EF 
     29#from RBFoundation.XMLClassBuilder import * 
     30#from RBFoundation.XMLClassBuilder import ElementFactory as EF 
     31from RBFoundation import XMLClassBuilder 
    3132from RBTelepathy import ErrorTypes 
     33 
     34#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     35#~ Constants / Variables / Etc.  
     36#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     37 
     38EF = XMLClassBuilder.ElementFactory 
     39XMLClassBuilderObjectMixin = XMLClassBuilder.XMLClassBuilderObjectMixin 
    3240 
    3341#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    4755#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    4856 
    49 class StreamPacketBuilder(XMLClassBuilder): 
     57class PacketFactorySet(XMLClassBuilder.ElementFactorySet): 
     58    def _GetElementFactoryIndices(self, (namespace, node)): 
     59        yield (namespace, node) 
     60        yield (namespace, ) 
     61        yield node 
     62        yield None 
     63 
     64#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     65 
     66class StreamPacketBuilder(XMLClassBuilder.XMLClassBuilder): 
    5067    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5168    #~ Constants / Variables / Etc.  
    5269    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    5370 
    54     NamespaceSynonyms = RBNamespaceSynonyms 
    55     DefaultNamespace = RBNamespaceSynonyms[None] 
     71    ElementFactories = PacketFactorySet() 
    5672 
    5773    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     
    7793    def _xmlChildFactory(self, owner, parent, node, attributes, namespacemap): 
    7894        try: 
    79             XMLClassBuilder._xmlChildFactory(self, owner, parent, node, attributes, namespacemap) 
     95            XMLClassBuilder.XMLClassBuilder._xmlChildFactory(self, owner, parent, node, attributes, namespacemap) 
    8096        except KeyError, e: 
    8197            # Well, we don't seem to have a packet for that... Error!  =) 
  • trunk/RBTelepathy/RBTelepathy/Packet/__init__.py

    r455 r463  
    2020##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    2121 
    22 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    23 #~ Constants / Variables / Etc.  
    24 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    25  
    26 RBTelepathyNamespace = 'http://namespaces.runeblade.com/RBTelepathy' 
    27 RBNamespaceSynonyms = { 
    28     'RuneBladeMessaging': RBTelepathyNamespace, 
    29     'RBTelepathy': RBTelepathyNamespace, 
    30     'RBM': RBTelepathyNamespace, 
    31     None: RBTelepathyNamespace, 
    32     } 
    33 RBDefaultNamespace = RBNamespaceSynonyms[None] 
    34  
  • trunk/RBTelepathy/demo/simple/client/AuthenticationHandler.py

    r458 r463  
    4949    NamespaceSynonyms = {None: DefaultNamespace} 
    5050    DefaultNamespace = NamespaceSynonyms[None] 
    51     ElementFactories = ElementFactorySet({ 
     51    ElementFactories = PacketFactorySet({ 
    5252            (DefaultNamespace, 'response'): Elements.Factory(Elements.PacketElement), 
    5353            (DefaultNamespace, 'challenge'): Elements.Factory(Elements.PacketElement), 
     
    9494    NamespaceSynonyms = {None: DefaultNamespace} 
    9595    DefaultNamespace = NamespaceSynonyms[None] 
    96     ElementFactories = ElementFactorySet({ 
     96    ElementFactories = PacketFactorySet({ 
    9797            (DefaultNamespace, 'as'): Elements.Factory(Elements.URIAddressElement), 
    9898            (DefaultNamespace, 'method'): Elements.Factory(method), 
  • trunk/RBTelepathy/demo/simple/client/ErrorHandler.py

    r458 r463  
    4040    NamespaceSynonyms = {None: DefaultNamespace} 
    4141    DefaultNamespace = NamespaceSynonyms[None] 
    42     ElementFactories = ElementFactorySet({ 
     42    ElementFactories = PacketFactorySet({ 
    4343            (DefaultNamespace, ): Elements.Factory(Elements.PacketElement), 
    4444        }) 
  • trunk/RBTelepathy/demo/simple/client/MessageHandler.py

    r458 r463  
    4545    NamespaceSynonyms = {None: DefaultNamespace} 
    4646    DefaultNamespace = NamespaceSynonyms[None] 
    47     ElementFactories = ElementFactorySet({ 
     47    ElementFactories = PacketFactorySet({ 
    4848            (DefaultNamespace, 'to'): Elements.Factory(Elements.URIAddressElement), 
    4949            (DefaultNamespace, 'from'): Elements.Factory(Elements.URIAddressElement), 
  • trunk/RBTelepathy/demo/simple/host/AuthenticationHandler.py

    r458 r463  
    4040    NamespaceSynonyms = {None: DefaultNamespace} 
    4141    DefaultNamespace = NamespaceSynonyms[None] 
    42     ElementFactories = ElementFactorySet({ 
     42    ElementFactories = PacketFactorySet({ 
    4343            (DefaultNamespace, 'response'): Elements.Factory(Elements.PacketElement), 
    4444            (DefaultNamespace, 'challenge'): Elements.Factory(Elements.PacketElement), 
     
    124124    NamespaceSynonyms = {None: DefaultNamespace} 
    125125    DefaultNamespace = NamespaceSynonyms[None] 
    126     ElementFactories = ElementFactorySet({ 
     126    ElementFactories = PacketFactorySet({ 
    127127            (DefaultNamespace, 'as'): Elements.Factory(Elements.URIAddressElement), 
    128128            (DefaultNamespace, 'method'): Elements.Factory(DefaultAuthMethod), 
  • trunk/RBTelepathy/demo/simple/host/ErrorHandler.py

    r458 r463  
    4040    NamespaceSynonyms = {None: DefaultNamespace} 
    4141    DefaultNamespace = NamespaceSynonyms[None] 
    42     ElementFactories = ElementFactorySet({ 
     42    ElementFactories = PacketFactorySet({ 
    4343            (DefaultNamespace, ): Elements.Factory(Elements.PacketElement), 
    4444        }) 
  • trunk/RBTelepathy/demo/simple/host/MessageHandler.py

    r458 r463  
    4545    NamespaceSynonyms = {None: DefaultNamespace} 
    4646    DefaultNamespace = NamespaceSynonyms[None] 
    47     ElementFactories = ElementFactorySet({ 
     47    ElementFactories = PacketFactorySet({ 
    4848            (DefaultNamespace, 'to'): Elements.Factory(Elements.URIAddressElement), 
    4949            (DefaultNamespace, 'from'): Elements.Factory(Elements.URIAddressElement),