summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-09-29 14:56:32 +0000
committerBrian Curtin <brian.curtin@gmail.com>2010-09-29 14:56:32 +0000
commita02653b38a142f844e6263b649134563cd6d28b1 (patch)
tree73fa9a1820b61a4abbc99b1b692a5ca66b9695ca
parent66bfda800714cc34294c475066b285dbd169bd23 (diff)
downloadcpython-git-a02653b38a142f844e6263b649134563cd6d28b1.tar.gz
Merged revisions 85109 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85109 | brian.curtin | 2010-09-29 09:51:42 -0500 (Wed, 29 Sep 2010) | 4 lines Fix #9978. WINFUNCTYPE is from ctypes, not from ctypes.wintypes. r85073 changed the importing in wintypes to not use *, so the previous usage here became even more incorrect. ........
-rw-r--r--Lib/test/win_console_handler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/win_console_handler.py b/Lib/test/win_console_handler.py
index 17bbe1af48..3c2bfa1529 100644
--- a/Lib/test/win_console_handler.py
+++ b/Lib/test/win_console_handler.py
@@ -8,12 +8,12 @@ See http://msdn.microsoft.com/en-us/library/ms685049%28v=VS.85%29.aspx for a
similar example in C.
"""
-from ctypes import wintypes
+from ctypes import wintypes, WINFUNCTYPE
import signal
import ctypes
# Function prototype for the handler function. Returns BOOL, takes a DWORD.
-HandlerRoutine = wintypes.WINFUNCTYPE(wintypes.BOOL, wintypes.DWORD)
+HandlerRoutine = WINFUNCTYPE(wintypes.BOOL, wintypes.DWORD)
def _ctrl_handler(sig):
"""Handle a sig event and return 0 to terminate the process"""