summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2012-11-05 17:34:49 -0800
committerJeff Forcier <jeff@bitprophet.org>2012-11-05 17:35:06 -0800
commit0981c25cd8ef651e6274feae8b3b6acd0869b680 (patch)
tree1b7c06ceb1d251d581df4fa63263e1d07bba61d5
parent0a276ac34bac3c9729992e3fdb3622d8916c5096 (diff)
Formatting
-rw-r--r--paramiko/config.py39
1 files changed, 19 insertions, 20 deletions
diff --git a/paramiko/config.py b/paramiko/config.py
index cf35cdc6..8daee18c 100644
--- a/paramiko/config.py
+++ b/paramiko/config.py
@@ -157,26 +157,25 @@ class SSHConfig (object):
host = socket.gethostname().split('.')[0]
fqdn = socket.getfqdn()
homedir = os.path.expanduser('~')
- replacements = {'controlpath' :
- [
- ('%h', config['hostname']),
- ('%l', fqdn),
- ('%L', host),
- ('%n', hostname),
- ('%p', port),
- ('%r', remoteuser),
- ('%u', user)
- ],
- 'identityfile' :
- [
- ('~', homedir),
- ('%d', homedir),
- ('%h', config['hostname']),
- ('%l', fqdn),
- ('%u', user),
- ('%r', remoteuser)
- ]
- }
+ replacements = {
+ 'controlpath': [
+ ('%h', config['hostname']),
+ ('%l', fqdn),
+ ('%L', host),
+ ('%n', hostname),
+ ('%p', port),
+ ('%r', remoteuser),
+ ('%u', user)
+ ],
+ 'identityfile': [
+ ('~', homedir),
+ ('%d', homedir),
+ ('%h', config['hostname']),
+ ('%l', fqdn),
+ ('%u', user),
+ ('%r', remoteuser)
+ ]
+ }
for k in config:
if k in replacements:
for find, replace in replacements[k]: