Revert changes

Author: vstinner

Lib/_pyrepl/windows_console.py

@@ -23,7 +23,7 @@
 import os
 import sys
 
-import ctypes.util
+import ctypes
 import types
 from dataclasses import dataclass
 from ctypes.wintypes import (
@@ -37,7 +37,7 @@
     WCHAR,
     SHORT,
 )
-from ctypes import POINTER, Union
+from ctypes import Structure, POINTER, Union
 from typing import TYPE_CHECKING
 
 from _colorize import ANSIColors
@@ -723,56 +723,61 @@ def repaint(self) -> None:
 
 
 # Windows interop
-@ctypes.util.struct
-class CONSOLE_SCREEN_BUFFER_INFO:
-    dwSize: _COORD
-    dwCursorPosition: _COORD
-    wAttributes: WORD
-    srWindow: SMALL_RECT
-    dwMaximumWindowSize: _COORD
+class CONSOLE_SCREEN_BUFFER_INFO(Structure):
+    _fields_ = [
+        ("dwSize", _COORD),
+        ("dwCursorPosition", _COORD),
+        ("wAttributes", WORD),
+        ("srWindow", SMALL_RECT),
+        ("dwMaximumWindowSize", _COORD),
+    ]
 
 
-@ctypes.util.struct
-class CONSOLE_CURSOR_INFO:
-    dwSize: DWORD
-    bVisible: BOOL
+class CONSOLE_CURSOR_INFO(Structure):
+    _fields_ = [
+        ("dwSize", DWORD),
+        ("bVisible", BOOL),
+    ]
 
 
-@ctypes.util.struct
-class CHAR_INFO:
-    UnicodeChar: WCHAR
-    Attributes: WORD
+class CHAR_INFO(Structure):
+    _fields_ = [
+        ("UnicodeChar", WCHAR),
+        ("Attributes", WORD),
+    ]
 
 
 class Char(Union):
-    UnicodeChar: WCHAR
-    Char: CHAR
+    _fields_ = [
+        ("UnicodeChar", WCHAR),
+        ("Char", CHAR),
+    ]
 
 
-@ctypes.util.struct
-class KeyEvent:
-    bKeyDown: BOOL
-    wRepeatCount: WORD
-    wVirtualKeyCode: WORD
-    wVirtualScanCode: WORD
-    uChar: Char
-    dwControlKeyState: DWORD
+class KeyEvent(ctypes.Structure):
+    _fields_ = [
+        ("bKeyDown", BOOL),
+        ("wRepeatCount", WORD),
+        ("wVirtualKeyCode", WORD),
+        ("wVirtualScanCode", WORD),
+        ("uChar", Char),
+        ("dwControlKeyState", DWORD),
+    ]
 
 
-@ctypes.util.struct
-class WindowsBufferSizeEvent:
-    dwSize: _COORD
+class WindowsBufferSizeEvent(ctypes.Structure):
+    _fields_ = [("dwSize", _COORD)]
 
 
 class ConsoleEvent(ctypes.Union):
-    KeyEvent: KeyEvent
-    WindowsBufferSizeEvent: WindowsBufferSizeEvent
+    _fields_ = [
+        ("KeyEvent", KeyEvent),
+        ("WindowsBufferSizeEvent", WindowsBufferSizeEvent),
+    ]
 
 
-@ctypes.util.struct
-class INPUT_RECORD:
-    EventType: WORD
-    Event: ConsoleEvent
+class INPUT_RECORD(Structure):
+    _fields_ = [("EventType", WORD), ("Event", ConsoleEvent)]
 
 
 KEY_EVENT = 0x01

Lib/ctypes/wintypes.py

@@ -1,5 +1,5 @@
 # The most useful windows datatypes
-import ctypes.util
+import ctypes
 
 BYTE = ctypes.c_ubyte
 WORD = ctypes.c_ushort
@@ -102,84 +102,75 @@ def __repr__(self):
 ################################################################
 # Some important structure definitions
 
-@ctypes.util.struct
-class RECT:
-    left: LONG
-    top: LONG
-    right: LONG
-    bottom: LONG
+class RECT(ctypes.Structure):
+    _fields_ = [("left", LONG),
+                ("top", LONG),
+                ("right", LONG),
+                ("bottom", LONG)]
 tagRECT = _RECTL = RECTL = RECT
 
-@ctypes.util.struct
-class _SMALL_RECT:
-    Left: SHORT
-    Top: SHORT
-    Right: SHORT
-    Bottom: SHORT
+class _SMALL_RECT(ctypes.Structure):
+    _fields_ = [('Left', SHORT),
+                ('Top', SHORT),
+                ('Right', SHORT),
+                ('Bottom', SHORT)]
 SMALL_RECT = _SMALL_RECT
 
-@ctypes.util.struct
-class _COORD:
-    X: SHORT
-    Y: SHORT
+class _COORD(ctypes.Structure):
+    _fields_ = [('X', SHORT),
+                ('Y', SHORT)]
 
-@ctypes.util.struct
-class POINT:
-    x: LONG
-    y: LONG
+class POINT(ctypes.Structure):
+    _fields_ = [("x", LONG),
+                ("y", LONG)]
 tagPOINT = _POINTL = POINTL = POINT
 
-@ctypes.util.struct
-class SIZE:
-    cx: LONG
-    cy: LONG
+class SIZE(ctypes.Structure):
+    _fields_ = [("cx", LONG),
+                ("cy", LONG)]
 tagSIZE = SIZEL = SIZE
 
 def RGB(red, green, blue):
     return red + (green << 8) + (blue << 16)
 
-@ctypes.util.struct
-class FILETIME:
-    dwLowDateTime: DWORD
-    dwHighDateTime: DWORD
+class FILETIME(ctypes.Structure):
+    _fields_ = [("dwLowDateTime", DWORD),
+                ("dwHighDateTime", DWORD)]
 _FILETIME = FILETIME
 
-@ctypes.util.struct
-class MSG:
-    hWnd: HWND
-    message: UINT
-    wParam: WPARAM
-    lParam: LPARAM
-    time: DWORD
-    pt: POINT
+class MSG(ctypes.Structure):
+    _fields_ = [("hWnd", HWND),
+                ("message", UINT),
+                ("wParam", WPARAM),
+                ("lParam", LPARAM),
+                ("time", DWORD),
+                ("pt", POINT)]
 tagMSG = MSG
 MAX_PATH = 260
 
-@ctypes.util.struct
-class WIN32_FIND_DATAA:
-    dwFileAttributes: DWORD
-    ftCreationTime: FILETIME
-    ftLastAccessTime: FILETIME
-    ftLastWriteTime: FILETIME
-    nFileSizeHigh: DWORD
-    nFileSizeLow: DWORD
-    dwReserved0: DWORD
-    dwReserved1: DWORD
-    cFileName: CHAR * MAX_PATH
-    cAlternateFileName: CHAR * 14
-
-@ctypes.util.struct
-class WIN32_FIND_DATAW:
-    dwFileAttributes: DWORD
-    ftCreationTime: FILETIME
-    ftLastAccessTime: FILETIME
-    ftLastWriteTime: FILETIME
-    nFileSizeHigh: DWORD
-    nFileSizeLow: DWORD
-    dwReserved0: DWORD
-    dwReserved1: DWORD
-    cFileName: WCHAR * MAX_PATH
-    cAlternateFileName: WCHAR * 14
+class WIN32_FIND_DATAA(ctypes.Structure):
+    _fields_ = [("dwFileAttributes", DWORD),
+                ("ftCreationTime", FILETIME),
+                ("ftLastAccessTime", FILETIME),
+                ("ftLastWriteTime", FILETIME),
+                ("nFileSizeHigh", DWORD),
+                ("nFileSizeLow", DWORD),
+                ("dwReserved0", DWORD),
+                ("dwReserved1", DWORD),
+                ("cFileName", CHAR * MAX_PATH),
+                ("cAlternateFileName", CHAR * 14)]
+
+class WIN32_FIND_DATAW(ctypes.Structure):
+    _fields_ = [("dwFileAttributes", DWORD),
+                ("ftCreationTime", FILETIME),
+                ("ftLastAccessTime", FILETIME),
+                ("ftLastWriteTime", FILETIME),
+                ("nFileSizeHigh", DWORD),
+                ("nFileSizeLow", DWORD),
+                ("dwReserved0", DWORD),
+                ("dwReserved1", DWORD),
+                ("cFileName", WCHAR * MAX_PATH),
+                ("cAlternateFileName", WCHAR * 14)]
 
 ################################################################
 # Pointer types

Lib/test/test_buffer.py

@@ -37,7 +37,6 @@
 
 try:
     import ctypes
-    import ctypes.util
 except ImportError:
     ctypes = None
 
@@ -2850,11 +2849,8 @@ def test_memoryview_cast_1D_ND(self):
 
         if ctypes:
             # format: "T{>l:x:>d:y:}"
-            @ctypes.util.struct(endian='big')
-            class BEPoint:
-                x: ctypes.c_long
-                y: ctypes.c_double
-
+            class BEPoint(ctypes.BigEndianStructure):
+                _fields_ = [("x", ctypes.c_long), ("y", ctypes.c_double)]
             point = BEPoint(100, 200.1)
             m1 = memoryview(point)
             m2 = m1.cast('B')
@@ -3254,11 +3250,8 @@ def test_memoryview_compare_special_cases(self):
         # Some ctypes format strings are unknown to the struct module.
         if ctypes:
             # format: "T{>l:x:>l:y:}"
-            @ctypes.util.struct(endian='big')
-            class BEPoint:
-                x: ctypes.c_long
-                y: ctypes.c_long
-
+            class BEPoint(ctypes.BigEndianStructure):
+                _fields_ = [("x", ctypes.c_long), ("y", ctypes.c_long)]
             point = BEPoint(100, 200)
             a = memoryview(point)
             b = memoryview(point)
@@ -3995,11 +3988,8 @@ def test_memoryview_tobytes(self):
         # Unknown formats are handled: tobytes() purely depends on itemsize.
         if ctypes:
             # format: "T{>l:x:>l:y:}"
-            @ctypes.util.struct(endian='big')
-            class BEPoint:
-                x: ctypes.c_long
-                y: ctypes.c_long
-
+            class BEPoint(ctypes.BigEndianStructure):
+                _fields_ = [("x", ctypes.c_long), ("y", ctypes.c_long)]
             point = BEPoint(100, 200)
             a = memoryview(point)
             self.assertEqual(a.tobytes(), bytes(point))