Merge branch '2.0'

paramiko · Dec 6, 2016 · c7d52bd · c7d52bd
2 parents 8636ab0 + 702dbd2
commit c7d52bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/paramiko/_winapi.py b/paramiko/_winapi.py
@@ -89,7 +89,7 @@ def handle_nonzero_success(result):
 GMEM_MOVEABLE = 0x2
 
 GlobalAlloc = ctypes.windll.kernel32.GlobalAlloc
-GlobalAlloc.argtypes = ctypes.wintypes.UINT, ctypes.c_ssize_t
+GlobalAlloc.argtypes = ctypes.wintypes.UINT, ctypes.c_size_t
 GlobalAlloc.restype = ctypes.wintypes.HANDLE
 
 GlobalLock = ctypes.windll.kernel32.GlobalLock

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :bug:`802 (1.17+)` (via :issue:`804`) Update our vendored Windows API module
+  to address errors of the form ``AttributeError: 'module' object has no
+  attribute 'c_ssize_t'``. Credit to Jason R. Coombs.
 * :bug:`824` Fix the implementation of ``PKey.write_private_key_file`` (this
   method is only publicly defined on subclasses; the fix was in the private
   real implementation) so it passes the correct params to ``open()``. This bug