dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up thread ident import/exec a bit.

This commit is contained in:
Jeff Forcier 2014-01-21 13:51:09 -08:00
parent 2621db122d
commit a7ea04842e
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
paramiko/win_pageant.py
View File

@ -27,11 +27,15 @@ import array
import ctypes.wintypes import ctypes.wintypes
import platform import platform
import struct import struct
import thread
import threading try:
import _thread as thread # Python 3.x
except ImportError:
import thread # Python 2.5-2.7
from . import _winapi from . import _winapi
_AGENT_COPYDATA_ID = 0x804e50ba _AGENT_COPYDATA_ID = 0x804e50ba
_AGENT_MAX_MSGLEN = 8192 _AGENT_MAX_MSGLEN = 8192
# Note: The WM_COPYDATA value is pulled from win32con, as a workaround # Note: The WM_COPYDATA value is pulled from win32con, as a workaround
@ -39,15 +43,6 @@ _AGENT_MAX_MSGLEN = 8192
win32con_WM_COPYDATA = 74 win32con_WM_COPYDATA = 74
def get_thread_ident():
# thread.get_ident() exists from Py2.5 to Py2.7.
# threading.current_thread().ident exists from Py2.6 up to Py3.4.
try:
return threading.current_thread().ident
except AttributeError:
return thread.get_ident()
def _get_pageant_window_object(): def _get_pageant_window_object():
return ctypes.windll.user32.FindWindowA('Pageant', 'Pageant') return ctypes.windll.user32.FindWindowA('Pageant', 'Pageant')
@ -88,7 +83,7 @@ def _query_pageant(msg):
return None return None
# create a name for the mmap # create a name for the mmap
map_name = 'PageantRequest%08x' % get_thread_ident() map_name = 'PageantRequest%08x' % thread.get_ident()
pymap = _winapi.MemoryMap(map_name, _AGENT_MAX_MSGLEN, pymap = _winapi.MemoryMap(map_name, _AGENT_MAX_MSGLEN,
_winapi.get_security_attributes_for_user(), _winapi.get_security_attributes_for_user(),