summaryrefslogtreecommitdiff
path: root/paramiko/config.py
diff options
context:
space:
mode:
authorNick Pillitteri <nick@tshlabs.org>2016-01-08 16:47:54 -0500
committerNick Pillitteri <nick@tshlabs.org>2016-01-08 17:08:56 -0500
commit0c93fa94fbbb8d6284ee89e82298cc0e580203b4 (patch)
tree5ec90339f409177c52b83cf6ab701d6137b981e9 /paramiko/config.py
parentd0d0c32b92bebfec3ff2627b30d3d4732f10ce89 (diff)
downloadparamiko-0c93fa94fbbb8d6284ee89e82298cc0e580203b4.tar.gz
Update SSHConfig.parse to strip leading and trailing whitespace
Fixes #499
Diffstat (limited to 'paramiko/config.py')
-rw-r--r--paramiko/config.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/paramiko/config.py b/paramiko/config.py
index 5c2efdcc..6553691b 100644
--- a/paramiko/config.py
+++ b/paramiko/config.py
@@ -55,7 +55,9 @@ class SSHConfig (object):
"""
host = {"host": ['*'], "config": {}}
for line in file_obj:
- line = line.rstrip('\r\n').lstrip()
+ # Strip any leading or trailing whitespace from the line.
+ # See https://github.com/paramiko/paramiko/issues/499 for more info.
+ line = line.strip()
if not line or line.startswith('#'):
continue
if '=' in line: