diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-01-19 14:47:33 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-01-19 14:47:33 -0800 |
| commit | 8d1fb10d58b4e80ce225bacb634f4544df8aef48 (patch) | |
| tree | 6c5fc99722cb4ca6878459f55d5952d50617ac7c /paramiko/config.py | |
| parent | 38cc76f8586ef141fdd051a97a65dc0c7e93f645 (diff) | |
| parent | 4968eaf8c92c0b59037444dcd4ce08a71e203ec2 (diff) | |
| download | paramiko-8d1fb10d58b4e80ce225bacb634f4544df8aef48.tar.gz | |
Merge branch '1.14' into 1.15
Diffstat (limited to 'paramiko/config.py')
| -rw-r--r-- | paramiko/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/paramiko/config.py b/paramiko/config.py index 0b1345fd..e18fa4bf 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -57,7 +57,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 |