diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-10-01 16:54:24 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-10-01 16:54:24 -0700 |
| commit | cdd023ff66591b02982b88b37806cf80457c950c (patch) | |
| tree | c82c30370da97f8d76e29c27fdc0f8d7cedaf2a3 | |
| parent | af9f16f9a03bede1c5af84d00bc73097f6b45b54 (diff) | |
| parent | 417285fd7c40c6b756504e394d3cda1d56ff876d (diff) | |
Merge branch '1.14' into 1.15
Conflicts:
sites/www/changelog.rst
| -rw-r--r-- | paramiko/win_pageant.py | 5 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/paramiko/win_pageant.py b/paramiko/win_pageant.py index 20b1b0b9..4b482bee 100644 --- a/paramiko/win_pageant.py +++ b/paramiko/win_pageant.py @@ -26,6 +26,7 @@ import ctypes.wintypes import platform import struct from paramiko.util import * +from paramiko.py3compat import b try: import _thread as thread # Python 3.x @@ -43,7 +44,7 @@ win32con_WM_COPYDATA = 74 def _get_pageant_window_object(): - return ctypes.windll.user32.FindWindowA('Pageant', 'Pageant') + return ctypes.windll.user32.FindWindowA(b('Pageant'), b('Pageant')) def can_talk_to_agent(): @@ -90,7 +91,7 @@ def _query_pageant(msg): with pymap: pymap.write(msg) # Create an array buffer containing the mapped filename - char_buffer = array.array("c", b(map_name) + zero_byte) + char_buffer = array.array("b", b(map_name) + zero_byte) char_buffer_address, char_buffer_size = char_buffer.buffer_info() # Create a string to use for the SendMessage function call cds = COPYDATASTRUCT(_AGENT_COPYDATA_ID, char_buffer_size, diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 3e654f69..b954a230 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :bug:`320` Update our win_pageant module to be Python 3 compatible. Thanks to +``@sherbang`` and ``@adamkerz`` for the patches. * :release:`1.15.1 <2014-09-22>` * :bug:`399` SSH agent forwarding (potentially other functionality as well) would hang due to incorrect values passed into the new window size |