diff options
| author | Jeremy T. Bouse <jbouse@debian.org> | 2015-03-12 21:35:59 -0400 |
|---|---|---|
| committer | Jeremy T. Bouse <jbouse@debian.org> | 2015-03-12 21:35:59 -0400 |
| commit | 01653e8710c38f3066078b2773ad47ccb3670c58 (patch) | |
| tree | 8284e75857a06945167186d09dd9021fd24c2ee1 /paramiko/win_pageant.py | |
| parent | 74794f84c2d9906aea5024dfccd90482fff9bab3 (diff) | |
| parent | f784a533d6e1d09e89dc254f3493b491e19c94f0 (diff) | |
| download | python-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar python-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar.gz | |
Merge tag 'upstream/1.15.2'
Upstream version 1.15.2
Diffstat (limited to 'paramiko/win_pageant.py')
| -rw-r--r-- | paramiko/win_pageant.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/paramiko/win_pageant.py b/paramiko/win_pageant.py index 20b1b0b..4b482be 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, |