Enable strict_optional in aqt/. and aqt/browser

.mypy.ini

@@ -1,15 +1,15 @@
 [mypy]
 python_version = 3.9
-pretty = false
-no_strict_optional = true
-show_error_codes = true
-check_untyped_defs = true
+pretty = False
+strict_optional = False
+show_error_codes = True
+check_untyped_defs = True
 disallow_untyped_decorators = True
 warn_redundant_casts = True
 warn_unused_configs = True
-strict_equality = true
-namespace_packages = true
-explicit_package_bases = true
+strict_equality = True
+namespace_packages = True
+explicit_package_bases = True
 mypy_path = 
  pylib,
  out/pylib, 
@@ -26,21 +26,25 @@ disallow_untyped_defs = True
 disallow_untyped_defs = False
 [mypy-anki.exporting]
 disallow_untyped_defs = False
+[mypy-aqt]
+strict_optional = True
+[mypy-aqt.browser.*]
+strict_optional = True
 [mypy-aqt.operations.*]
-no_strict_optional = false
+strict_optional = True
 [mypy-anki.scheduler.base]
-no_strict_optional = false
+strict_optional = True
 [mypy-anki._backend.rsbridge]
 ignore_missing_imports = True
 [mypy-anki._vendor.stringcase]
 disallow_untyped_defs = False
 [mypy-stringcase]
 ignore_missing_imports = True
 [mypy-aqt.mpv]
-disallow_untyped_defs=false
-ignore_errors=true
+disallow_untyped_defs=False
+ignore_errors=True
 [mypy-aqt.winpaths]
-disallow_untyped_defs=false
+disallow_untyped_defs=False
 
 [mypy-win32file]
 ignore_missing_imports = True

CONTRIBUTORS

@@ -187,7 +187,7 @@ Christian Donat <https://github.com/cdonat2>
 Asuka Minato <https://asukaminato.eu.org>
 Dillon Baldwin <https://github.com/DillBal>
 Voczi <https://github.com/voczi>
-Ben Nguyen <[email protected]> 
+Ben Nguyen <[email protected]>  
 Themis Demetriades <[email protected]>
 Luke Bartholomew <[email protected]>
 Gregory Abrasaldo <[email protected]>

pylib/anki/collection.py

@@ -472,7 +472,7 @@ def update_image_occlusion_note(
  # Object helpers
  ##########################################################################
 
- def get_card(self, id: CardId) -> Card:
+ def get_card(self, id: CardId | None) -> Card:
  return Card(self, id)
 
  def update_cards(

qt/aqt/__init__.py

@@ -280,7 +280,10 @@ def fn_ngettext(a, b, c) -> None: # type: ignore
  if _qtrans.load(f"qtbase_{qt_lang}", qt_dir):
  app.installTranslator(_qtrans)
 
- return anki.lang.current_i18n
+ backend = anki.lang.current_i18n
+ assert backend is not None
+
+ return backend
 
 
 # App initialisation
@@ -291,11 +294,13 @@ class NativeEventFilter(QAbstractNativeEventFilter):
  def nativeEventFilter(
  self, eventType: Any, message: Any
  ) -> tuple[bool, sip.voidptr | None]:
+
  if eventType == "windows_generic_MSG":
- import ctypes
+ import ctypes.wintypes
 
  msg = ctypes.wintypes.MSG.from_address(int(message))
  if msg.message == 17: # WM_QUERYENDSESSION
+ assert mw is not None
  if mw.can_auto_sync():
  mw.app._set_windows_shutdown_block_reason(tr.sync_syncing())
  mw.progress.single_shot(100, mw.unloadProfileAndExit)
@@ -325,6 +330,7 @@ def _set_windows_shutdown_block_reason(self, reason: str) -> None:
  import ctypes
  from ctypes import windll, wintypes # type: ignore
 
+ assert mw is not None
  windll.user32.ShutdownBlockReasonCreate(
  wintypes.HWND.from_param(int(mw.effectiveWinId())),
  ctypes.c_wchar_p(reason),
@@ -334,6 +340,7 @@ def _unset_windows_shutdown_block_reason(self) -> None:
  if is_win:
  from ctypes import windll, wintypes # type: ignore
 
+ assert mw is not None
  windll.user32.ShutdownBlockReasonDestroy(
  wintypes.HWND.from_param(int(mw.effectiveWinId())),
  )
@@ -388,7 +395,9 @@ def onRecv(self) -> None:
  # OS X file/url handler
  ##################################################
 
- def event(self, evt: QEvent) -> bool:
+ def event(self, evt: QEvent | None) -> bool:
+ assert evt is not None
+
  if evt.type() == QEvent.Type.FileOpen:
  self.appMsg.emit(evt.file() or "raise") # type: ignore
  return True
@@ -397,7 +406,9 @@ def event(self, evt: QEvent) -> bool:
  # Global cursor: pointer for Qt buttons
  ##################################################
 
- def eventFilter(self, src: Any, evt: QEvent) -> bool:
+ def eventFilter(self, src: Any, evt: QEvent | None) -> bool:
+ assert evt is not None
+
  pointer_classes = (
  QPushButton,
  QCheckBox,
@@ -547,6 +558,8 @@ def msgHandler(category: Any, ctx: Any, msg: Any) -> None:
 
 
 def write_profile_results() -> None:
+ assert profiler is not None
+
  profiler.disable()
  profile = "out/anki.prof"
  profiler.dump_stats(profile)