Skip to content

Big diff: use lower-case list and dict #5888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Aug 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
053b911
run scripts
Akuli Aug 8, 2021
3ca7f59
black and isort
Akuli Aug 8, 2021
1ad172a
Revert stubs/Pygments/pygments/token.pyi to origin/master
Akuli Aug 8, 2021
23b6305
more black and isort
Akuli Aug 8, 2021
7f9841f
Revert stdlib/plistlib.pyi to origin/master
Akuli Aug 8, 2021
39e174f
Revert stdlib/nntplib.pyi to origin/master
Akuli Aug 8, 2021
90043af
Revert stdlib/poplib.pyi to origin/master
Akuli Aug 8, 2021
d97c1d0
Revert stubs/decorator/decorator.pyi to origin/master
Akuli Aug 8, 2021
d927f56
Revert stdlib/os/__init__.pyi to origin/master
Akuli Aug 8, 2021
939445d
Revert stdlib/imaplib.pyi to origin/master
Akuli Aug 8, 2021
2f007c9
Revert stubs/docutils/docutils/parsers/rst/roles.pyi to origin/master
Akuli Aug 8, 2021
18bd9c3
Revert stdlib/pydoc.pyi to origin/master
Akuli Aug 8, 2021
954fb0a
Revert stdlib/tarfile.pyi to origin/master
Akuli Aug 8, 2021
2323b29
Revert stdlib/multiprocessing/managers.pyi to origin/master
Akuli Aug 8, 2021
854d4b1
Revert stubs/frozendict/frozendict.pyi to origin/master
Akuli Aug 8, 2021
b25cb4e
Revert stdlib/xmlrpc/server.pyi to origin/master
Akuli Aug 8, 2021
445f187
Revert stubs/requests/requests/models.pyi to origin/master
Akuli Aug 8, 2021
7777dde
Revert stubs/Werkzeug/werkzeug/http.pyi to origin/master
Akuli Aug 8, 2021
f2302cf
Revert stubs/Jinja2/jinja2/nodes.pyi to origin/master
Akuli Aug 8, 2021
324ad5e
Revert stubs/protobuf/google/protobuf/internal/containers.pyi to orig…
Akuli Aug 8, 2021
2fad665
Revert stubs/protobuf/google/protobuf/internal/enum_type_wrapper.pyi …
Akuli Aug 8, 2021
82ac2c6
Revert stubs/protobuf/google/protobuf/internal/well_known_types.pyi t…
Akuli Aug 8, 2021
e14df72
Revert stubs/protobuf/google/protobuf/json_format.pyi to origin/master
Akuli Aug 8, 2021
d2662c3
Revert stubs/protobuf/google/protobuf/message_factory.pyi to origin/m…
Akuli Aug 8, 2021
e79f12c
Revert stubs/protobuf/google/protobuf/symbol_database.pyi to origin/m…
Akuli Aug 8, 2021
91a4623
Merge remote-tracking branch 'origin/master' into list
Akuli Aug 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions stdlib/__future__.pyi
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import sys
from typing import List

class _Feature:
def __init__(self, optionalRelease: sys._version_info, mandatoryRelease: sys._version_info, compiler_flag: int) -> None: ...
Expand All @@ -20,7 +19,7 @@ generator_stop: _Feature
if sys.version_info >= (3, 7):
annotations: _Feature

all_feature_names: List[str] # undocumented
all_feature_names: list[str] # undocumented

if sys.version_info >= (3, 7):
__all__ = [
Expand Down
134 changes: 67 additions & 67 deletions stdlib/_ast.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ if sys.version_info >= (3, 8):
class TypeIgnore(type_ignore):
tag: str
class FunctionType(mod):
argtypes: typing.List[expr]
argtypes: list[expr]
returns: expr

class Module(mod):
body: typing.List[stmt]
body: list[stmt]
if sys.version_info >= (3, 8):
type_ignores: typing.List[TypeIgnore]
type_ignores: list[TypeIgnore]

class Interactive(mod):
body: typing.List[stmt]
body: list[stmt]

class Expression(mod):
body: expr
Expand All @@ -48,32 +48,32 @@ class stmt(AST): ...
class FunctionDef(stmt):
name: _identifier
args: arguments
body: typing.List[stmt]
decorator_list: typing.List[expr]
body: list[stmt]
decorator_list: list[expr]
returns: expr | None

class AsyncFunctionDef(stmt):
name: _identifier
args: arguments
body: typing.List[stmt]
decorator_list: typing.List[expr]
body: list[stmt]
decorator_list: list[expr]
returns: expr | None

class ClassDef(stmt):
name: _identifier
bases: typing.List[expr]
keywords: typing.List[keyword]
body: typing.List[stmt]
decorator_list: typing.List[expr]
bases: list[expr]
keywords: list[keyword]
body: list[stmt]
decorator_list: list[expr]

class Return(stmt):
value: expr | None

class Delete(stmt):
targets: typing.List[expr]
targets: list[expr]

class Assign(stmt):
targets: typing.List[expr]
targets: list[expr]
value: expr

class AugAssign(stmt):
Expand All @@ -90,60 +90,60 @@ class AnnAssign(stmt):
class For(stmt):
target: expr
iter: expr
body: typing.List[stmt]
orelse: typing.List[stmt]
body: list[stmt]
orelse: list[stmt]

class AsyncFor(stmt):
target: expr
iter: expr
body: typing.List[stmt]
orelse: typing.List[stmt]
body: list[stmt]
orelse: list[stmt]

class While(stmt):
test: expr
body: typing.List[stmt]
orelse: typing.List[stmt]
body: list[stmt]
orelse: list[stmt]

class If(stmt):
test: expr
body: typing.List[stmt]
orelse: typing.List[stmt]
body: list[stmt]
orelse: list[stmt]

class With(stmt):
items: typing.List[withitem]
body: typing.List[stmt]
items: list[withitem]
body: list[stmt]

class AsyncWith(stmt):
items: typing.List[withitem]
body: typing.List[stmt]
items: list[withitem]
body: list[stmt]

class Raise(stmt):
exc: expr | None
cause: expr | None

class Try(stmt):
body: typing.List[stmt]
handlers: typing.List[ExceptHandler]
orelse: typing.List[stmt]
finalbody: typing.List[stmt]
body: list[stmt]
handlers: list[ExceptHandler]
orelse: list[stmt]
finalbody: list[stmt]

class Assert(stmt):
test: expr
msg: expr | None

class Import(stmt):
names: typing.List[alias]
names: list[alias]

class ImportFrom(stmt):
module: _identifier | None
names: typing.List[alias]
names: list[alias]
level: int

class Global(stmt):
names: typing.List[_identifier]
names: list[_identifier]

class Nonlocal(stmt):
names: typing.List[_identifier]
names: list[_identifier]

class Expr(stmt):
value: expr
Expand All @@ -155,7 +155,7 @@ class expr(AST): ...

class BoolOp(expr):
op: boolop
values: typing.List[expr]
values: list[expr]

class BinOp(expr):
left: expr
Expand All @@ -176,28 +176,28 @@ class IfExp(expr):
orelse: expr

class Dict(expr):
keys: typing.List[expr | None]
values: typing.List[expr]
keys: list[expr | None]
values: list[expr]

class Set(expr):
elts: typing.List[expr]
elts: list[expr]

class ListComp(expr):
elt: expr
generators: typing.List[comprehension]
generators: list[comprehension]

class SetComp(expr):
elt: expr
generators: typing.List[comprehension]
generators: list[comprehension]

class DictComp(expr):
key: expr
value: expr
generators: typing.List[comprehension]
generators: list[comprehension]

class GeneratorExp(expr):
elt: expr
generators: typing.List[comprehension]
generators: list[comprehension]

class Await(expr):
value: expr
Expand All @@ -210,21 +210,21 @@ class YieldFrom(expr):

class Compare(expr):
left: expr
ops: typing.List[cmpop]
comparators: typing.List[expr]
ops: list[cmpop]
comparators: list[expr]

class Call(expr):
func: expr
args: typing.List[expr]
keywords: typing.List[keyword]
args: list[expr]
keywords: list[keyword]

class FormattedValue(expr):
value: expr
conversion: int | None
format_spec: expr | None

class JoinedStr(expr):
values: typing.List[expr]
values: list[expr]

if sys.version_info < (3, 8):
class Num(expr): # Deprecated in 3.8; use Constant
Expand Down Expand Up @@ -267,7 +267,7 @@ class Slice(_SliceT):

if sys.version_info < (3, 9):
class ExtSlice(slice):
dims: typing.List[slice]
dims: list[slice]
class Index(slice):
value: expr

Expand All @@ -285,11 +285,11 @@ class Name(expr):
ctx: expr_context

class List(expr):
elts: typing.List[expr]
elts: list[expr]
ctx: expr_context

class Tuple(expr):
elts: typing.List[expr]
elts: list[expr]
ctx: expr_context

class expr_context(AST): ...
Expand All @@ -299,7 +299,7 @@ if sys.version_info < (3, 9):
class AugStore(expr_context): ...
class Param(expr_context): ...
class Suite(mod):
body: typing.List[stmt]
body: list[stmt]

class Del(expr_context): ...
class Load(expr_context): ...
Expand Down Expand Up @@ -341,25 +341,25 @@ class NotIn(cmpop): ...
class comprehension(AST):
target: expr
iter: expr
ifs: typing.List[expr]
ifs: list[expr]
is_async: int

class excepthandler(AST): ...

class ExceptHandler(excepthandler):
type: expr | None
name: _identifier | None
body: typing.List[stmt]
body: list[stmt]

class arguments(AST):
if sys.version_info >= (3, 8):
posonlyargs: typing.List[arg]
args: typing.List[arg]
posonlyargs: list[arg]
args: list[arg]
vararg: arg | None
kwonlyargs: typing.List[arg]
kw_defaults: typing.List[expr | None]
kwonlyargs: list[arg]
kw_defaults: list[expr | None]
kwarg: arg | None
defaults: typing.List[expr]
defaults: list[expr]

class arg(AST):
arg: _identifier
Expand All @@ -380,33 +380,33 @@ class withitem(AST):
if sys.version_info >= (3, 10):
class Match(stmt):
subject: expr
cases: typing.List[match_case]
cases: list[match_case]
class pattern(AST): ...
# Without the alias, Pyright complains variables named pattern are recursively defined
_pattern = pattern
class match_case(AST):
pattern: _pattern
guard: expr | None
body: typing.List[stmt]
body: list[stmt]
class MatchValue(pattern):
value: expr
class MatchSingleton(pattern):
value: Literal[True, False, None]
class MatchSequence(pattern):
patterns: typing.List[pattern]
patterns: list[pattern]
class MatchStar(pattern):
name: _identifier | None
class MatchMapping(pattern):
keys: typing.List[expr]
patterns: typing.List[pattern]
keys: list[expr]
patterns: list[pattern]
rest: _identifier | None
class MatchClass(pattern):
cls: expr
patterns: typing.List[pattern]
kwd_attrs: typing.List[_identifier]
kwd_patterns: typing.List[pattern]
patterns: list[pattern]
kwd_attrs: list[_identifier]
kwd_patterns: list[pattern]
class MatchAs(pattern):
pattern: _pattern | None
name: _identifier | None
class MatchOr(pattern):
patterns: typing.List[pattern]
patterns: list[pattern]
10 changes: 5 additions & 5 deletions stdlib/_compat_pickle.pyi
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from typing import Dict, Tuple
from typing import Tuple

IMPORT_MAPPING: Dict[str, str]
NAME_MAPPING: Dict[Tuple[str, str], Tuple[str, str]]
IMPORT_MAPPING: dict[str, str]
NAME_MAPPING: dict[Tuple[str, str], Tuple[str, str]]
PYTHON2_EXCEPTIONS: Tuple[str, ...]
MULTIPROCESSING_EXCEPTIONS: Tuple[str, ...]
REVERSE_IMPORT_MAPPING: Dict[str, str]
REVERSE_NAME_MAPPING: Dict[Tuple[str, str], Tuple[str, str]]
REVERSE_IMPORT_MAPPING: dict[str, str]
REVERSE_NAME_MAPPING: dict[Tuple[str, str], Tuple[str, str]]
PYTHON3_OSERROR_EXCEPTIONS: Tuple[str, ...]
PYTHON3_IMPORTERROR_EXCEPTIONS: Tuple[str, ...]
4 changes: 2 additions & 2 deletions stdlib/_csv.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ _DialectLike = Union[str, Dialect, Type[Dialect]]
class _reader(Iterator[List[str]]):
dialect: Dialect
line_num: int
def __next__(self) -> List[str]: ...
def __next__(self) -> list[str]: ...

class _writer:
dialect: Dialect
Expand All @@ -38,5 +38,5 @@ def reader(csvfile: Iterable[str], dialect: _DialectLike = ..., **fmtparams: Any
def register_dialect(name: str, dialect: Any = ..., **fmtparams: Any) -> None: ...
def unregister_dialect(name: str) -> None: ...
def get_dialect(name: str) -> Dialect: ...
def list_dialects() -> List[str]: ...
def list_dialects() -> list[str]: ...
def field_size_limit(new_limit: int = ...) -> int: ...
4 changes: 2 additions & 2 deletions stdlib/_dummy_thread.pyi
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from typing import Any, Callable, Dict, NoReturn, Tuple
from typing import Any, Callable, NoReturn, Tuple

TIMEOUT_MAX: int
error = RuntimeError

def start_new_thread(function: Callable[..., Any], args: Tuple[Any, ...], kwargs: Dict[str, Any] = ...) -> None: ...
def start_new_thread(function: Callable[..., Any], args: Tuple[Any, ...], kwargs: dict[str, Any] = ...) -> None: ...
def exit() -> NoReturn: ...
def get_ident() -> int: ...
def allocate_lock() -> LockType: ...
Expand Down
Loading