diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2012-11-29 08:52:39 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2012-11-29 08:52:39 -0800 |
| commit | 2575b3efc48cb9f42c3105015284b9afd9c67625 (patch) | |
| tree | 640853c2b6d7465b69079369d70ddaf798d859e1 | |
| parent | d47e6b9e7f3df5497d0ba664656e1a8b396ddd20 (diff) | |
Fix #94
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | paramiko/client.py | 3 | ||||
| -rw-r--r-- | paramiko/config.py | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -18,6 +18,8 @@ v1.10.0 (DD MM YYYY) * #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting of the command's internal channel object's timeout. Thanks to Cernov Vladimir for the patch. +* #94: Remove duplication of SSH port constant. Thanks to Olle Lundberg for the + catch. v1.9.0 (6th Nov 2012) --------------------- diff --git a/paramiko/client.py b/paramiko/client.py index 97ae4494..a777b45b 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -28,6 +28,7 @@ import warnings from paramiko.agent import Agent from paramiko.common import * +from paramiko.config import SSH_PORT from paramiko.dsskey import DSSKey from paramiko.hostkeys import HostKeys from paramiko.resource import ResourceManager @@ -37,8 +38,6 @@ from paramiko.transport import Transport from paramiko.util import retry_on_signal -SSH_PORT = 22 - class MissingHostKeyPolicy (object): """ Interface for defining the policy that L{SSHClient} should use when the diff --git a/paramiko/config.py b/paramiko/config.py index 2828d903..d1ce9490 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -25,7 +25,7 @@ import os import re import socket -SSH_PORT=22 +SSH_PORT = 22 proxy_re = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I) |