diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
| commit | b2be63ec623b5944f9b84cac8b8f41aeb2b42fb7 (patch) | |
| tree | 389e17b0c08cd34872a2e3afbc34860ab44fb3ed /paramiko/win_pageant.py | |
| parent | bd61c7c0a9a4a2020d0acfb6a01e9ec85bb43b8e (diff) | |
| parent | ae078f51d622931954e47e78029a889c4e721a05 (diff) | |
| download | paramiko-b2be63ec623b5944f9b84cac8b8f41aeb2b42fb7.tar.gz | |
Merge remote-tracking branch 'scottkmaxwell/py3-support-without-py25' into python3
Conflicts:
dev-requirements.txt
paramiko/__init__.py
paramiko/file.py
paramiko/hostkeys.py
paramiko/message.py
paramiko/proxy.py
paramiko/server.py
paramiko/transport.py
paramiko/util.py
paramiko/win_pageant.py
setup.py
Diffstat (limited to 'paramiko/win_pageant.py')
| -rw-r--r-- | paramiko/win_pageant.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/win_pageant.py b/paramiko/win_pageant.py index d588e81d..d815a322 100644 --- a/paramiko/win_pageant.py +++ b/paramiko/win_pageant.py @@ -27,6 +27,7 @@ import array import ctypes.wintypes import platform import struct +from paramiko.util import * try: import _thread as thread # Python 3.x @@ -91,7 +92,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, |