Merge pull request #17 from Avasam/use-pywin32-stubs-fork

Use pywin32 stubs fork

Author: Avasam

.flake8

@@ -1,27 +1,25 @@
 [flake8]
 color=always
 max-line-length=120
-; Auto generated
-exclude=src/gen/
-; Linebreak before binary operator
-; Allow default value other than "..."
-; Allow imports at the bottom of file
-ignore=W503,Y015,E402
+exclude=
+  src/gen/, ; Auto generated
+  typings/cv2-stubs/__init__.pyi, ; External existing stub
+ignore=
+  W503, ; Linebreak before binary operator
+  Y015, ; Allow default value other than "..."
+  E402, ; Allow imports at the bottom of file
+  Y026, ; Not using typing_extensions
 per-file-ignores=
-    ; Uses "pass" for empty body
-    ; Default arguments
-    ; Doesn't work when using /** below for some reasons
-    ; win32typing.pyi:  Y010,Y011,
-    ; win32gui.pyi:     Y010,Y011,
-    ;
-    ; Quotes
-    ; undefined name 'Unknown'
     ; allow ... on same line as def
-    ; Naming stuff
-    ;
-    ; Q002 quote docstring for cv2-stubs
-    typings/**:       Q000,F821,E704,N8,E501,Y010,Y011,Q002
+    ; ???
+    ; Docstrings in type stubs
+    ; Function bodys contain other than just ... (eg: raise)
+    ; Single quote docstrings
+    typings/cv2-stubs/__init__.pyi: Q000,N8, E704,Y021,Y010,Q002
 
+    ; Quotes
+    ; Naming conventions can't be controlled for external libraries
+    __init__.pyi: Q000,N8
 ; PyQt methods
 ignore-names=closeEvent,paintEvent,keyPressEvent,mousePressEvent,mouseMoveEvent,mouseReleaseEvent
 ; McCabe max-complexity is also taken care of by Pylint and doesn't fail the build there

.gitignore

@@ -19,3 +19,4 @@ dist/
 
 # Dev settings
 *.pkl
+settings.toml

.vscode/settings.json

@@ -58,6 +58,12 @@
   "python.linting.pylintCategorySeverity.refactor": "Warning",
   "python.linting.flake8Enabled": true,
   "python.linting.flake8CategorySeverity.E": "Warning",
+  // Pyflakes
+  "python.linting.flake8CategorySeverity.F": "Warning",
+  // PEP8 Naming convention
+  "python.linting.flake8CategorySeverity.N": "Warning",
+  // PYI
+  "python.linting.flake8CategorySeverity.Y": "Warning",
   // PyRight obsoletes mypy
   "python.linting.mypyEnabled": false,
   // Is already wrapped by Flake8, prospector and pylama

pyproject.toml

@@ -16,20 +16,23 @@ aggressive = 3
 pythonPlatform = "Windows"
 typeCheckingMode = "strict"
 # Extra strict
-reportPropertyTypeMismatch=true
-reportUninitializedInstanceVariable=true
-reportCallInDefaultInitializer=true
-reportImplicitStringConcatenation=true
+reportImplicitStringConcatenation="error"
+reportCallInDefaultInitializer="error"
+reportMissingSuperCall="none" # False positives on base classes
+reportPropertyTypeMismatch="error"
+reportUninitializedInstanceVariable="error"
+reportUnnecessaryTypeIgnoreComment="error"
+reportUnusedCallResult="none"
 ignore = [
   # Auto generated
   "src/gen/",
   # We expect stub files to be incomplete or contain useless statements
   "typings/",
 ]
-reportMissingTypeStubs = "information"
+reportMissingTypeStubs = "warning"
 # False positives with TYPE_CHECKING
 reportImportCycles = "information"
-# False positives with PyQt .connect. pylint(no-member) works instead
+# False positives with PyQt .connect . pylint(no-member) works instead
 reportFunctionMemberAccess = "none"
 # Extra runtime safety
 reportUnnecessaryComparison = "warning"
@@ -70,11 +73,17 @@ load-plugins = [
   # "pylint.extensions.comparison_placement",
   # "pylint.extensions.for_any_all",
 ]
-ignore-paths = [
-  # Auto generated
-  "^src/gen/.*$",
+# Auto generated (doesn't work)
+ignore-paths = ["src/gen/.*"]
   # We expect stub files to be incomplete or contain useless statements
-  "^.*\\.pyi$",
+ignore-patterns = [
+  ".*\\.pyi",
+  # Auto generated
+  "about.py",
+  "design.py",
+  "resources_rc.py",
+  "settings.py",
+  "update_checker.py",
 ]
 # No need to mention the fixmes
 disable = ["fixme"]

scripts/requirements.txt

@@ -27,8 +27,8 @@ bandit
 flake8
 flake8-pyi
 flake8-quotes
-pylint
-pywin32-stubs
+pylint>=2.13
+git+https://github.com/Avasam/pywin32-stubs.git#egg=pywin32-stubs # https://github.com/kaluluosi/pywin32-stubs/pull/4
 simplejson
 types-simplejson>=3.17.2
 types-requests

src/AutoSplit.py

@@ -760,8 +760,7 @@ def __get_capture_for_comparison(self):
         if capture is None:
             # Try to recover by using the window name
             self.live_image.setText("Trying to recover window...")
-            # https://github.com/kaluluosi/pywin32-stubs/issues/7
-            hwnd = win32gui.FindWindow(None, self.settings_dict["captured_window_title"])  # type: ignore
+            hwnd = win32gui.FindWindow(None, self.settings_dict["captured_window_title"])
             # Don't fallback to desktop
             if hwnd:
                 self.hwnd = hwnd

src/capture_windows.py

@@ -13,7 +13,6 @@
 import win32ui
 import pywintypes
 from win32 import win32gui
-from win32typing import PyCBitmap, PyCDC
 
 # This is an undocumented nFlag value for PrintWindow
 PW_RENDERFULLCONTENT = 0x00000002
@@ -40,16 +39,15 @@ def capture_region(hwnd: int, selection: Region, print_window: bool):
 
     # If the window closes while it's being manipulated, it could cause a crash
     try:
-        window_dc: int = win32gui.GetWindowDC(hwnd)
-        # https://github.com/kaluluosi/pywin32-stubs/issues/6
-        dc_object: PyCDC = win32ui.CreateDCFromHandle(window_dc)  # type: ignore
+        window_dc = win32gui.GetWindowDC(hwnd)
+        dc_object = win32ui.CreateDCFromHandle(window_dc)
 
         # Causes a 10-15x performance drop. But allows recording hardware accelerated windows
         if print_window:
             ctypes.windll.user32.PrintWindow(hwnd, dc_object.GetSafeHdc(), PW_RENDERFULLCONTENT)
 
         compatible_dc = dc_object.CreateCompatibleDC()
-        bitmap: PyCBitmap = win32ui.CreateBitmap()
+        bitmap = win32ui.CreateBitmap()
         bitmap.CreateCompatibleBitmap(dc_object, selection.width, selection.height)
         compatible_dc.SelectObject(bitmap)
         compatible_dc.BitBlt((0, 0),

src/settings_file.py

@@ -167,14 +167,14 @@ def __load_settings_from_file(autosplit: AutoSplit, load_settings_file_path: str
     autosplit.settings_dict["force_print_window"] = settings[20]
 
     if autosplit.settings_dict["captured_window_title"]:
-        # https://github.com/kaluluosi/pywin32-stubs/issues/7
-        hwnd = win32gui.FindWindow(None, autosplit.settings_dict["captured_window_title"])  # type: ignore
+        hwnd = win32gui.FindWindow(None, autosplit.settings_dict["captured_window_title"])
         if hwnd:
             autosplit.hwnd = hwnd
         else:
-            autosplit.live_image.setText("Reload settings after opening"
-                                         + f'\n"{autosplit.settings_dict["captured_window_title"]}"'
-                                         + "\nto automatically load Capture Region")
+            autosplit.live_image.setText(
+                "Reload settings after opening"
+                + f'\n"{autosplit.settings_dict["captured_window_title"]}"'
+                + "\nto automatically load Capture Region")
     return True
 
 

typings/PyInstaller/utils/hooks/__init__.pyi

@@ -1,8 +1,7 @@
-"""
+""" # noqa: Y021
 This type stub file was generated by pyright.
 """
-from typing import Any, Literal, Optional, Union
-from collections.abc import Callable
+from typing import Any, Literal, Optional, Union, Callable
 
 logger = ...
 PY_IGNORE_EXTENSIONS: set
@@ -85,11 +84,7 @@ def is_module_or_submodule(name, mod_or_submod):
     ...
 
 
-PY_DYLIB_PATTERNS = [
-    "*.dll",
-    "*.dylib",
-    "lib*.so",
-]
+PY_DYLIB_PATTERNS: str
 
 
 def collect_dynamic_libs(package: str, destdir: Optional[str] = ...) -> list[tuple[str, str]]:

typings/imagehash/__init__.pyi

@@ -1,22 +1,16 @@
-"""
+""" # noqa: Y021
 This type stub file was generated by pyright.
 """
-from __future__ import absolute_import, division, print_function
+from __future__ import absolute_import, division, print_function, annotations
 from PIL import Image
 
-__version__: str = ...
+__version__: str
 
 
 class ImageHash:
     def __init__(self, binary_array) -> None:
         ...
 
-    def __str__(self) -> str:
-        ...
-
-    def __repr__(self) -> str:
-        ...
-
     def __sub__(self, other: ImageHash) -> int:
         ...
 
@@ -89,13 +83,7 @@ class ImageMultiHash:
     def __hash__(self) -> int:
         ...
 
-    def __str__(self) -> str:
-        ...
-
-    def __repr__(self) -> str:
-        ...
-
-    def hash_diff(self, other_hash, hamming_cutoff=..., bit_error_rate=...) -> tuple[int, Unknown | int]:
+    def hash_diff(self, other_hash, hamming_cutoff=..., bit_error_rate=...) -> tuple[int, int]:
         ...
 
     def matches(self, other_hash, region_cutoff=..., hamming_cutoff=..., bit_error_rate=...):