Revision 4ba5e843 ncclient/transport/ssh.py

b/ncclient/transport/ssh.py
33 33

  
34 34
    def __init__(self):
35 35
        Session.__init__(self)
36
        self._system_host_keys = paramiko.HostKeys()
37 36
        self._host_keys = paramiko.HostKeys()
38
        self._host_keys_filename = None
37
        self._system_host_keys = paramiko.HostKeys()
39 38
        self._transport = None
40 39
        self._connected = False
41 40
        self._channel = None
......
83 82
                buf = StringIO()
84 83
                buf.write(rest)
85 84
                buf.seek(0)
86
                state = 0
85
                expect = 0
87 86
        self._buffer = buf
88 87
        self._parsing_state = expect
89 88
        self._parsing_pos = self._buffer.tell()
90 89
    
91 90
    def load_system_host_keys(self, filename=None):
92 91
        if filename is None:
93
            # try the user's .ssh key file, and mask exceptions
94 92
            filename = os.path.expanduser('~/.ssh/known_hosts')
95 93
            try:
96 94
                self._system_host_keys.load(filename)
97 95
            except IOError:
98
                pass
96
                # for windows
97
                filename = os.path.expanduser('~/ssh/known_hosts')
98
                try:
99
                    self._system_host_keys.load(filename)
100
                except IOError:
101
                    pass
99 102
            return
100 103
        self._system_host_keys.load(filename)
101 104
    
102 105
    def load_host_keys(self, filename):
103
        self._host_keys_filename = filename
104 106
        self._host_keys.load(filename)
105 107

  
106 108
    def add_host_key(self, key):
......
234 236
                logger.debug(e)
235 237
        
236 238
        if saved_exception is not None:
237
            raise AuthenticationError(repr(saved_exception))
239
            raise SSHAuthenticationError(repr(saved_exception))
238 240
        
239
        raise AuthenticationError('No authentication methods available')
241
        raise SSHAuthenticationError('No authentication methods available')
240 242
    
241 243
    def run(self):
242 244
        chan = self._channel

Also available in: Unified diff