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

DRY up the code for populating the return list

This commit is contained in:
Olle Lundberg 2012-11-20 00:45:32 +01:00
parent c79e6a3f92
commit ea3c3f53b6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paramiko/config.py
View File

@ -156,13 +156,10 @@ class SSHConfig (object):
ret = {} ret = {}
for match in matches: for match in matches:
for key, value in match['config'].iteritems(): for key, value in match['config'].iteritems():
if key == 'identityfile': if key not in ret:
if key in ret:
ret['identityfile'].extend(value)
else:
ret['identityfile'] = value
elif key not in ret:
ret[key] = value ret[key] = value
elif key == 'identityfile':
ret[key].extend(value)
ret = self._expand_variables(ret, hostname) ret = self._expand_variables(ret, hostname)
return ret return ret