diff options
| -rw-r--r-- | paramiko/config.py | 16 | ||||
| -rw-r--r-- | tests/test_util.py | 4 |
2 files changed, 3 insertions, 17 deletions
diff --git a/paramiko/config.py b/paramiko/config.py index 91b691ac..143223d9 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -82,7 +82,6 @@ class SSHConfig (object): """ Create a new OpenSSH config object. """ - self._proxyregex = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I) self._config = [] def parse(self, file_obj): @@ -98,7 +97,6 @@ class SSHConfig (object): if (line == '') or (line[0] == '#'): continue if '=' in line: -<<<<<<< HEAD # Ensure ProxyCommand gets properly split if line.lower().strip().startswith('proxycommand'): match = proxy_re.match(line) @@ -106,20 +104,6 @@ class SSHConfig (object): else: key, value = line.split('=', 1) key = key.strip().lower() -||||||| merged common ancestors - key, value = line.split('=', 1) - key = key.strip().lower() -======= - if not line.lower().startswith('proxycommand'): - key, value = line.split('=', 1) - key = key.strip().lower() - else: - #ProxyCommand have been specified with an equal - # sign. Eat that and split in two groups. - match = self._proxyregex.match(line) - key = match.group(1).lower() - value = match.group(2) ->>>>>>> Implement support for parsing proxycommand. else: # find first whitespace, and split there i = 0 diff --git a/tests/test_util.py b/tests/test_util.py index c97c1d58..e6f417d4 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -205,6 +205,7 @@ Host * self.assertRaises(AssertionError, lambda: paramiko.util.retry_on_signal(raises_other_exception)) +<<<<<<< HEAD def test_9_proxycommand_config_equals_parsing(self): """ ProxyCommand should not split on equals signs within the value. @@ -271,7 +272,8 @@ Host * paramiko.util.lookup_ssh_host_config(host, config), {'hostname': host, 'port': '8080'} ) - def test_10_host_config_test_proxycommand(self): + + def test_12_host_config_test_proxycommand(self): test_config_file = """ Host proxy-with-equal-divisor-and-space ProxyCommand = foo=bar |