diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 13:28:36 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-24 13:28:36 -0700 |
| commit | 37ff28d98ce6e25331ade80bbce2f26c21c20229 (patch) | |
| tree | 91e2ffe5961c2b90be4456d74eb325130c517f11 | |
| parent | 078b7c003bb2fd9423d23ce49e8de9f937dcfeea (diff) | |
| parent | f15b383e4499e85689bfcc83dc942f0b6c898264 (diff) | |
Merge branch '1.16'
| -rw-r--r-- | paramiko/_winapi.py | 6 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/paramiko/_winapi.py b/paramiko/_winapi.py index 9a8bdedd..77e0129c 100644 --- a/paramiko/_winapi.py +++ b/paramiko/_winapi.py @@ -1,6 +1,6 @@ """ Windows API functions implemented as ctypes functions and classes as found -in jaraco.windows (3.3). +in jaraco.windows (3.4.1). If you encounter issues with this module, please consider reporting the issues in jaraco.windows and asking the author to port the fixes back here. @@ -158,7 +158,7 @@ class MemoryMap(object): if self.pos + n >= self.length: # A little safety. raise ValueError("Refusing to write %d bytes" % n) dest = self.view + self.pos - length = ctypes.wintypes.SIZE(n) + length = ctypes.c_size_t(n) ctypes.windll.kernel32.RtlMoveMemory(dest, msg, length) self.pos += n @@ -168,7 +168,7 @@ class MemoryMap(object): """ out = ctypes.create_string_buffer(n) source = self.view + self.pos - length = ctypes.wintypes.SIZE(n) + length = ctypes.c_size_t(n) ctypes.windll.kernel32.RtlMoveMemory(out, source, length) self.pos += n return out.raw diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index f662ae9a..9ec970c7 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :bug:`613` (via :issue:`619`) Update to ``jaraco.windows`` 3.4.1 to fix some + errors related to ``ctypes`` on Windows platforms. Credit to Jason R. Coombs. * :support:`621 backported` Annotate some public attributes on `~paramiko.channel.Channel` such as ``.closed``. Thanks to Sergey Vasilyev for the report. |