diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fd187a67b..42ac66a3c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] fail-fast: false env: - PYRIGHT_VERSION: 1.1.273 # Must match pyright_test.py. + PYRIGHT_VERSION: 1.1.278 # Must match pyright_test.py. steps: - uses: actions/checkout@v3 - uses: jakebailey/pyright-action@v1 diff --git a/stdlib/pyexpat/__init__.pyi b/stdlib/pyexpat/__init__.pyi index cb1266cb1..7e635c58c 100644 --- a/stdlib/pyexpat/__init__.pyi +++ b/stdlib/pyexpat/__init__.pyi @@ -1,7 +1,6 @@ -import pyexpat.errors as errors -import pyexpat.model as model from _typeshed import ReadableBuffer, SupportsRead from collections.abc import Callable +from pyexpat import errors as errors, model as model from typing import Any from typing_extensions import TypeAlias, final diff --git a/stdlib/xml/__init__.pyi b/stdlib/xml/__init__.pyi index c524ac2b1..a487d2467 100644 --- a/stdlib/xml/__init__.pyi +++ b/stdlib/xml/__init__.pyi @@ -1 +1 @@ -import xml.parsers as parsers +from xml import parsers as parsers diff --git a/stdlib/xml/parsers/__init__.pyi b/stdlib/xml/parsers/__init__.pyi index cac086235..cebdb6a30 100644 --- a/stdlib/xml/parsers/__init__.pyi +++ b/stdlib/xml/parsers/__init__.pyi @@ -1 +1 @@ -import xml.parsers.expat as expat +from xml.parsers import expat as expat diff --git a/stubs/keyboard/keyboard/__init__.pyi b/stubs/keyboard/keyboard/__init__.pyi index 3235e0ac5..bfc19bc05 100644 --- a/stubs/keyboard/keyboard/__init__.pyi +++ b/stubs/keyboard/keyboard/__init__.pyi @@ -5,7 +5,6 @@ from typing import Optional from typing_extensions import TypeAlias from ._canonical_names import all_modifiers as all_modifiers, sided_modifiers as sided_modifiers -from ._generic import GenericListener as _GenericListener from ._keyboard_event import KEY_DOWN as KEY_DOWN, KEY_UP as KEY_UP, KeyboardEvent as KeyboardEvent _Key: TypeAlias = int | str diff --git a/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi b/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi index 08623c7d4..28d27b52c 100644 --- a/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi +++ b/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi @@ -8,9 +8,11 @@ from typing_extensions import Literal, TypeAlias import pkg_resources from PyInstaller import HOMEPATH as HOMEPATH from PyInstaller.depend.imphookapi import PostGraphAPI -from PyInstaller.utils.hooks import conda as conda_support +from PyInstaller.utils.hooks import conda from PyInstaller.utils.hooks.win32 import get_pywin32_module_file_attribute as get_pywin32_module_file_attribute +conda_support = conda + _Environ: TypeAlias = SupportsKeysAndGetItem[str, str] | Iterable[tuple[str, str]] | Mapping[str, str] PY_IGNORE_EXTENSIONS: set[str] diff --git a/stubs/six/six/moves/urllib/__init__.pyi b/stubs/six/six/moves/urllib/__init__.pyi index d08209c51..fa6dc9779 100644 --- a/stubs/six/six/moves/urllib/__init__.pyi +++ b/stubs/six/six/moves/urllib/__init__.pyi @@ -1,5 +1 @@ -import six.moves.urllib.error as error -import six.moves.urllib.parse as parse -import six.moves.urllib.request as request -import six.moves.urllib.response as response -import six.moves.urllib.robotparser as robotparser +from six.moves.urllib import error as error, parse as parse, request as request, response as response, robotparser as robotparser diff --git a/tests/pyright_test.py b/tests/pyright_test.py index 4a27cd9cc..c4ffe7ab1 100755 --- a/tests/pyright_test.py +++ b/tests/pyright_test.py @@ -6,7 +6,7 @@ import subprocess import sys from pathlib import Path -_PYRIGHT_VERSION = "1.1.273" # Must match .github/workflows/tests.yml. +_PYRIGHT_VERSION = "1.1.278" # Must match .github/workflows/tests.yml. _WELL_KNOWN_FILE = Path("tests", "pyright_test.py")