diff --git a/direct/src/showbase/ShowBaseGlobal.py b/direct/src/showbase/ShowBaseGlobal.py index 3e656c045f..4cd4e8623b 100644 --- a/direct/src/showbase/ShowBaseGlobal.py +++ b/direct/src/showbase/ShowBaseGlobal.py @@ -64,8 +64,6 @@ hidden = NodePath("hidden") loader: Loader -direct: "DirectSession" - # Set direct notify categories now that we have config directNotify.setDconfigLevels() diff --git a/direct/src/tkpanels/Inspector.py b/direct/src/tkpanels/Inspector.py index 29bebcf16f..51e448f30d 100644 --- a/direct/src/tkpanels/Inspector.py +++ b/direct/src/tkpanels/Inspector.py @@ -11,6 +11,7 @@ so that I can just type: ``inspect(anObject)`` any time. See :ref:`inspection-utilities` for more information. """ +from __future__ import annotations __all__ = ['inspect', 'inspectorFor', 'Inspector', 'ModuleInspector', 'ClassInspector', 'InstanceInspector', 'FunctionInspector', 'InstanceMethodInspector', 'CodeInspector', 'ComplexInspector', 'DictionaryInspector', 'SequenceInspector', 'SliceInspector', 'InspectorWindow'] @@ -31,7 +32,7 @@ def inspect(anObject): ### private -_InspectorMap: "dict[str, str]" +_InspectorMap: dict[str, str] def inspectorFor(anObject): diff --git a/direct/src/wxwidgets/WxPandaShell.py b/direct/src/wxwidgets/WxPandaShell.py index 09e15add96..853be93206 100755 --- a/direct/src/wxwidgets/WxPandaShell.py +++ b/direct/src/wxwidgets/WxPandaShell.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import wx from wx.lib.agw import fourwaysplitter as FWS @@ -9,8 +11,6 @@ from direct.task.TaskManagerGlobal import taskMgr from .WxAppShell import WxAppShell from .ViewPort import Viewport, ViewportManager -from typing import Optional - ID_FOUR_VIEW = 401 ID_TOP_VIEW = 402 ID_FRONT_VIEW = 403 @@ -27,7 +27,7 @@ class WxPandaShell(WxAppShell): copyright = ('Copyright 2010 Disney Online Studios.' + '\nAll Rights Reserved.') - MENU_TEXTS: dict[int, tuple[str, Optional[str]]] = { + MENU_TEXTS: dict[int, tuple[str, str | None]] = { ID_FOUR_VIEW: ("Four Views", None), ID_TOP_VIEW: ("Top View", None), ID_FRONT_VIEW: ("Front View", None), diff --git a/tests/run_mypy.py b/tests/run_mypy.py index df27d80cda..30c1624888 100644 --- a/tests/run_mypy.py +++ b/tests/run_mypy.py @@ -1,7 +1,7 @@ -import os import pathlib import shutil import subprocess +import sys import tempfile @@ -10,15 +10,16 @@ def main(): direct_src = root / 'direct' / 'src' mypy_config = root / 'mypy.ini' with tempfile.TemporaryDirectory() as temp_dir: - os.environ['MYPYPATH'] = temp_dir direct_copy = pathlib.Path(temp_dir, 'direct') shutil.copytree(direct_src, direct_copy) - subprocess.run([ + command = [ 'mypy', - str(direct_copy), + str(direct_copy.resolve()), '--config-file', - str(mypy_config), - ]) + str(mypy_config.resolve()), + ] + result = subprocess.run(command, cwd=temp_dir) + sys.exit(result.returncode) if __name__ == '__main__':