From fd5e29b5a8aff1fe9f11f9f7bee5f0eb85ae569a Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 11:22:07 -0800 Subject: Somehow missed a pretty important change in the changelog --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index ed9fd008..30bca139 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,8 @@ v1.8.1 (DD MM YYYY) v1.8.0 (3rd Oct 2012) --------------------- +* #17 ('ssh' 28): Fix spurious `NoneType has no attribute 'error'` and similar + exceptions that crop up on interpreter exit. * 'ssh' 32: Raise a more useful error explaining which `known_hosts` key line was problematic, when encountering `binascii` issues decoding known host keys. Thanks to `@thomasvs` for catch & patch. -- cgit v1.2.3 From 31244a2ccbf9e2e8607236e859cbf38ddafd6060 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 13:30:20 -0800 Subject: Changelog re #77 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 30bca139..f13cb9a8 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Releases v1.9.0 (DD MM YYYY) ------------------- +* #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter + overriding creation of an internal, implicit socket object. v1.8.1 (DD MM YYYY) ------------------- -- cgit v1.2.3 From 8e8dcea2953dfd888602f37330c9f26e3f151244 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 15:34:46 -0800 Subject: Add in big attribution big in prep for having ProxyCommand done --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index f13cb9a8..02ec1421 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ v1.9.0 (DD MM YYYY) * #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter overriding creation of an internal, implicit socket object. +* Thanks in no particular order to Erwin Bolwidt, Oskari Saarenmaa, Steven + Noonan, Vladimir Lazarenko, Lincoln de Sousa, Valentino Volonghi and Github + user `@acrish` for the various and sundry patches leading to the above + changes. v1.8.1 (DD MM YYYY) ------------------- -- cgit v1.2.3 From fb5d245b3148250bb3d7d6b46c2ec2b7914982a7 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 17:04:25 -0800 Subject: More attributions --- NEWS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 02ec1421..83a524c5 100644 --- a/NEWS +++ b/NEWS @@ -18,9 +18,9 @@ v1.9.0 (DD MM YYYY) * #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter overriding creation of an internal, implicit socket object. * Thanks in no particular order to Erwin Bolwidt, Oskari Saarenmaa, Steven - Noonan, Vladimir Lazarenko, Lincoln de Sousa, Valentino Volonghi and Github - user `@acrish` for the various and sundry patches leading to the above - changes. + Noonan, Vladimir Lazarenko, Lincoln de Sousa, Valentino Volonghi, Olle + Lundberg, and Github user `@acrish` for the various and sundry patches + leading to the above changes. v1.8.1 (DD MM YYYY) ------------------- -- cgit v1.2.3 From 7a3cb790a6561f391be6118b75b9f74513820517 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 17:55:37 -0800 Subject: Changelog re #97 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 83a524c5..75dda2c2 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Releases v1.9.0 (DD MM YYYY) ------------------- +* #97 (with a little #93): Improve config parsing of `ProxyCommand` directives + and provide a wrapper class to allow subprocess-driven proxy commands to be + used as `sock=` arguments for `SSHClient.connect`. * #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter overriding creation of an internal, implicit socket object. * Thanks in no particular order to Erwin Bolwidt, Oskari Saarenmaa, Steven -- cgit v1.2.3 From 7f4c26f8601b2335b210896d2cb06348957e7aae Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 6 Nov 2012 13:08:41 -0800 Subject: Cut 1.8.1 --- NEWS | 4 ++-- paramiko/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index adcc1b91..26382ff2 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.8.1 (DD MM YYYY) -------------------- +v1.8.1 (6th Nov 2012) +--------------------- * #90: Ensure that callbacks handed to `SFTPClient.get()` always fire at least once, even for zero-length files downloaded. Thanks to Github user `@enB` for diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 8c158538..cd4dbe02 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -55,7 +55,7 @@ if sys.version_info < (2, 2): __author__ = "Jeff Forcier " -__version__ = "1.8.0" +__version__ = "1.8.1" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/setup.py b/setup.py index 73407b03..06597c6d 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.8.0", + version = "1.8.1", description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org", -- cgit v1.2.3 From 65de2529a9e21f66c72f6335886db5a7f2ea6b75 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 6 Nov 2012 13:10:03 -0800 Subject: Update changelog date for 1.9.0 --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index d7d37092..55420463 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.9.0 (DD MM YYYY) -------------------- +v1.9.0 (6th Nov 2012) +--------------------- * #97 (with a little #93): Improve config parsing of `ProxyCommand` directives and provide a wrapper class to allow subprocess-driven proxy commands to be -- cgit v1.2.3 From 2403504b44de773c3f566e7d647bc0e8661af918 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 28 Nov 2012 22:22:33 -0800 Subject: Fix #113: add timeout passthru to exec_command --- NEWS | 7 +++++++ paramiko/client.py | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 55420463..0627ad80 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,13 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +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. + v1.9.0 (6th Nov 2012) --------------------- diff --git a/paramiko/client.py b/paramiko/client.py index 07560a39..97ae4494 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -350,7 +350,7 @@ class SSHClient (object): self._agent.close() self._agent = None - def exec_command(self, command, bufsize=-1): + def exec_command(self, command, bufsize=-1, timeout=None): """ Execute a command on the SSH server. A new L{Channel} is opened and the requested command is executed. The command's input and output @@ -361,12 +361,15 @@ class SSHClient (object): @type command: str @param bufsize: interpreted the same way as by the built-in C{file()} function in python @type bufsize: int + @param timeout: set command's channel timeout. See L{Channel.settimeout}.settimeout + @type timeout: int @return: the stdin, stdout, and stderr of the executing command @rtype: tuple(L{ChannelFile}, L{ChannelFile}, L{ChannelFile}) @raise SSHException: if the server fails to execute the command """ chan = self._transport.open_session() + chan.settimeout(timeout) chan.exec_command(command) stdin = chan.makefile('wb', bufsize) stdout = chan.makefile('rb', bufsize) -- cgit v1.2.3 From 2575b3efc48cb9f42c3105015284b9afd9c67625 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 29 Nov 2012 08:52:39 -0800 Subject: Fix #94 --- NEWS | 2 ++ paramiko/client.py | 3 +-- paramiko/config.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 0627ad80..2dba8e0e 100644 --- a/NEWS +++ b/NEWS @@ -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) -- cgit v1.2.3 From f6ed6a8bbff9aabc58176b04e61c84b0509ecb7b Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 29 Nov 2012 08:55:43 -0800 Subject: Changelog re #80, fixes #80 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 2dba8e0e..1a6427a1 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,9 @@ v1.10.0 (DD MM YYYY) for the patch. * #94: Remove duplication of SSH port constant. Thanks to Olle Lundberg for the catch. +* #80: Expose the internal "is closed" property of the file transfer class + `BufferedFile` as `.closed`, better conforming to Python's file interface. + Thanks to `@smunaut` and James Hiscock for catch & patch. v1.9.0 (6th Nov 2012) --------------------- -- cgit v1.2.3 From 0ae0e9800c7bfb3f8ea40fa0d33ebf6dff49f759 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 29 Nov 2012 18:06:38 -0800 Subject: Changelog re #71 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 1a6427a1..1cfaa7e7 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #71: Add `SFTPClient.putfo` and `.getfo` methods to allow direct + uploading/downloading of file-like objects. Thanks to Eric Buehl for the + patch. * #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. -- cgit v1.2.3 From ce86a53a37c1573a5633699cf7f795768907f9a2 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 2 Dec 2012 06:52:37 -0500 Subject: Updated NEWS --- NEWS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 1cfaa7e7..2aa5da60 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,10 @@ v1.10.0 (DD MM YYYY) * #80: Expose the internal "is closed" property of the file transfer class `BufferedFile` as `.closed`, better conforming to Python's file interface. Thanks to `@smunaut` and James Hiscock for catch & patch. +* #100: Remove use of PyWin32 in `win_pageant` module. Module was already + dependent on ctypes for constructing appropriate structures and had ctypes + implementations of all functionality. Thanks to Jason R. Coombs for the + patch. v1.9.0 (6th Nov 2012) --------------------- @@ -301,7 +305,7 @@ v1.5 (paras) 02oct05 separation * demo scripts fixed to have a better chance of loading the host keys correctly on windows/cygwin - + v1.4 (oddish) 17jul05 --------------------- * added SSH-agent support (for posix) from john rochester -- cgit v1.2.3