dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.10'

This commit is contained in:
Jeff Forcier 2013-05-05 13:59:41 -07:00
parent 777d1576ca 3c2f01c91f
commit d77a4d6421
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paramiko/hostkeys.py
View File

@ -66,7 +66,7 @@ class HostKeyEntry:
fields = line.split(' ') fields = line.split(' ')
if len(fields) < 3: if len(fields) < 3:
# Bad number of fields # Bad number of fields
log.warn("Not enough fields found in known_hosts in line %s (%r)" % log.info("Not enough fields found in known_hosts in line %s (%r)" %
(lineno, line)) (lineno, line))
return None return None
fields = fields[:3] fields = fields[:3]
@ -82,7 +82,7 @@ class HostKeyEntry:
elif keytype == 'ssh-dss': elif keytype == 'ssh-dss':
key = DSSKey(data=base64.decodestring(key)) key = DSSKey(data=base64.decodestring(key))
else: else:
log.warn("Unable to handle key of type %s" % (keytype,)) log.info("Unable to handle key of type %s" % (keytype,))
return None return None
except binascii.Error, e: except binascii.Error, e:
raise InvalidHostKey(line, e) raise InvalidHostKey(line, e)