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.
........

diff --git a/Lib/test/win_console_handler.py b/Lib/test/win_console_handler.py
index 17bbe1af48a8085f2c7c3b46a44672bd5e55b660..3c2bfa15291c58a19fcdb5a4c48529116c4916de 100644 (file)
--- 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"""