dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #94

This commit is contained in:
Jeff Forcier 2012-11-29 08:52:39 -08:00
parent d47e6b9e7f
commit 2575b3efc4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -18,6 +18,8 @@ v1.10.0 (DD MM YYYY)
* #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting * #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting
of the command's internal channel object's timeout. Thanks to Cernov Vladimir of the command's internal channel object's timeout. Thanks to Cernov Vladimir
for the patch. for the patch.
* #94: Remove duplication of SSH port constant. Thanks to Olle Lundberg for the
catch.
v1.9.0 (6th Nov 2012) v1.9.0 (6th Nov 2012)
--------------------- ---------------------

3
paramiko/client.py
View File

@ -28,6 +28,7 @@ import warnings
from paramiko.agent import Agent from paramiko.agent import Agent
from paramiko.common import * from paramiko.common import *
from paramiko.config import SSH_PORT
from paramiko.dsskey import DSSKey from paramiko.dsskey import DSSKey
from paramiko.hostkeys import HostKeys from paramiko.hostkeys import HostKeys
from paramiko.resource import ResourceManager from paramiko.resource import ResourceManager
@ -37,8 +38,6 @@ from paramiko.transport import Transport
from paramiko.util import retry_on_signal from paramiko.util import retry_on_signal
SSH_PORT = 22
class MissingHostKeyPolicy (object): class MissingHostKeyPolicy (object):
""" """
Interface for defining the policy that L{SSHClient} should use when the Interface for defining the policy that L{SSHClient} should use when the

2
paramiko/config.py
View File

@ -25,7 +25,7 @@ import os
import re import re
import socket import socket
SSH_PORT=22 SSH_PORT = 22
proxy_re = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I) proxy_re = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I)