diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:51:49 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-05 20:51:49 -0800 |
| commit | ac54d5cf2d9eaa29672eceadadda4118162368d6 (patch) | |
| tree | 79c7edd1af57a39e6d450ea1fdcfab28e9af73ce | |
| parent | 26b915f6ba2c54ff4534f1801f2eac1d0a822a93 (diff) | |
| parent | 40d6cad7774588f9c2b8a32e3dc9afb7e5a8f477 (diff) | |
Merge branch '1.17' into 1.18
| -rw-r--r-- | paramiko/_winapi.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/_winapi.py b/paramiko/_winapi.py index 94bf6017..c9797d23 100644 --- 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 index 7884b044..8d1ba3a2 100644 --- 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 |