Update pyright to 1.1.278 (#9077)

sobolevn · AlexWaygood · web-flow · commit 86f9d9300389 · 2022-11-03T15:32:10.000Z
Co-authored-by: Alex Waygood &lt;Alex.Waygood@Gmail.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
 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")
 
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import xml.parsers as parsers`
	`1`	`+from xml import parsers as parsers`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import xml.parsers.expat as expat`
	`1`	`+from xml.parsers import expat as expat`