Merge branch '1.14' into 1.15

Conflicts: sites/www/changelog.rst
beckjake · Oct 1, 2014 · cdd023f · cdd023f
2 parents af9f16f + 417285f
commit cdd023f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/paramiko/win_pageant.py b/paramiko/win_pageant.py
@@ -26,6 +26,7 @@
 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 @@
 
 
 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
@@ -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