[Python-checkins] r85110 - in python/branches/release27-maint: Lib/test/win_console_handler.py

brian.curtin python-checkins at python.org
Wed Sep 29 16:56:32 CEST 2010


Author: brian.curtin
Date: Wed Sep 29 16:56:32 2010
New Revision: 85110

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/win_console_handler.py

Modified: python/branches/release27-maint/Lib/test/win_console_handler.py
==============================================================================
--- python/branches/release27-maint/Lib/test/win_console_handler.py	(original)
+++ python/branches/release27-maint/Lib/test/win_console_handler.py	Wed Sep 29 16:56:32 2010
@@ -8,12 +8,12 @@
 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"""


More information about the Python-checkins mailing list