Revision 94265508 ncclient/transport/session.py

b/ncclient/transport/session.py
66 66
        self.send(HelloBuilder.build(self._client_capabilities))
67 67
        error = None
68 68
        init_event = Event()
69
        # callbacks
69 70
        def ok_cb(id, capabilities):
70
            self._id, self._capabilities = id, Capabilities(capabilities)
71
            self._id, self._server_capabilities = id, Capabilities(capabilities)
71 72
            init_event.set()
72 73
        def err_cb(err):
73 74
            error = err
......
75 76
        listener = HelloListener(ok_cb, err_cb)
76 77
        self.add_listener(listener)
77 78
        # start the subclass' main loop
78
        self.start()        
79
        self.start()
79 80
        # we expect server's hello message
80 81
        init_event.wait()
81 82
        # received hello message or an error happened
82 83
        self.remove_listener(listener)
83 84
        if error:
84 85
            raise error
85
        logger.debug('initialized:session-id:%s' % self._id)
86
        logger.info('initialized: session-id=%s | server_capabilities=%s' %
87
                     (self.id, self.server_capabilities))
86 88
    
87 89
    def send(self, message):
88 90
        logger.debug('queueing:%s' % message)
......
93 95

  
94 96
    def run(self):
95 97
        raise NotImplementedError
96
        
97
    def capabilities(self, whose='client'):
98
        if whose == 'client':
99
            return self._client_capabilities
100
        elif whose == 'server':
101
            return self._server_capabilities
102 98
    
103 99
    ### Properties
104 100
    
......
141 137
    
142 138
    def error(self, err):
143 139
        self._error_cb(err)
144

  
145

  
146
class DebugListener:
147
    
148
    def __str__(self):
149
        return 'DebugListener'
150
    
151
    def received(self, raw):
152
        logger.info('DebugListener:[received]:%s' % raw)
153
    
154
    def error(self, err):
155
        logger.info('DebugListener:[error]:%s' % err)

Also available in: Unified diff