diff options
| author | Jeremy T. Bouse <jbouse@debian.org> | 2014-05-11 22:30:25 -0400 |
|---|---|---|
| committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-05-11 22:30:25 -0400 |
| commit | 4e426087436d01fe00a120e5e7ce7a5e0a1e0970 (patch) | |
| tree | 16b810aaf50263083ca758b6bd70895cba4378a3 /paramiko/win_pageant.py | |
| parent | 3bb46c9cb414ca82afab715d2d0cc00ed71cfb6d (diff) | |
| download | python-paramiko-4e426087436d01fe00a120e5e7ce7a5e0a1e0970.tar python-paramiko-4e426087436d01fe00a120e5e7ce7a5e0a1e0970.tar.gz | |
Imported Upstream version 1.14.0upstream/1.14.0
Diffstat (limited to 'paramiko/win_pageant.py')
| -rw-r--r-- | paramiko/win_pageant.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/paramiko/win_pageant.py b/paramiko/win_pageant.py index d588e81..20b1b0b 100644 --- a/paramiko/win_pageant.py +++ b/paramiko/win_pageant.py @@ -21,12 +21,11 @@ Functions for communicating with Pageant, the basic windows ssh agent program. """ -from __future__ import with_statement - import array import ctypes.wintypes import platform import struct +from paramiko.util import * try: import _thread as thread # Python 3.x @@ -91,7 +90,7 @@ def _query_pageant(msg): with pymap: pymap.write(msg) # Create an array buffer containing the mapped filename - char_buffer = array.array("c", map_name + '\0') + char_buffer = array.array("c", 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, |