From 581705d9ee730488a6a4f30948c85d8da3f98274 Mon Sep 17 00:00:00 2001 From: Yusuke Miyazaki Date: Fri, 29 Jun 2018 02:29:45 +0900 Subject: [PATCH] Prefer to use ellipsis over pass (#2292) --- stdlib/2/_json.pyi | 6 ++-- stdlib/2/io.pyi | 9 ++--- stdlib/2/thread.pyi | 7 ++-- stdlib/2/tokenize.pyi | 6 ++-- stdlib/2and3/ctypes/__init__.pyi | 10 +++--- stdlib/2and3/poplib.pyi | 2 +- stdlib/2and3/threading.pyi | 3 +- stdlib/3/abc.pyi | 4 +-- stdlib/3/configparser.pyi | 12 +++---- stdlib/3/getpass.pyi | 3 +- stdlib/3/typing.pyi | 3 +- third_party/2/pycurl.pyi | 3 +- .../google/protobuf/internal/containers.pyi | 12 +++---- third_party/2and3/pynamodb/exceptions.pyi | 35 +++++-------------- third_party/3/jwt/__init__.pyi | 18 +++++----- 15 files changed, 47 insertions(+), 86 deletions(-) diff --git a/stdlib/2/_json.pyi b/stdlib/2/_json.pyi index dbf621d53..028b7b229 100644 --- a/stdlib/2/_json.pyi +++ b/stdlib/2/_json.pyi @@ -12,8 +12,6 @@ def scanstring(a, b, *args, **kwargs) -> tuple: raise TypeError() -class Encoder(object): - pass +class Encoder(object): ... -class Scanner(object): - pass +class Scanner(object): ... diff --git a/stdlib/2/io.pyi b/stdlib/2/io.pyi index e78ec5068..07f247186 100644 --- a/stdlib/2/io.pyi +++ b/stdlib/2/io.pyi @@ -33,13 +33,10 @@ SEEK_END = ... # type: int class IOBase(_io._IOBase): ... -class RawIOBase(_io._RawIOBase, IOBase): - pass +class RawIOBase(_io._RawIOBase, IOBase): ... -class BufferedIOBase(_io._BufferedIOBase, IOBase): - pass +class BufferedIOBase(_io._BufferedIOBase, IOBase): ... # Note: In the actual io.py, TextIOBase subclasses IOBase. # (Which we don't do here because we don't want to subclass both TextIO and BinaryIO.) -class TextIOBase(_io._TextIOBase): - pass +class TextIOBase(_io._TextIOBase): ... diff --git a/stdlib/2/thread.pyi b/stdlib/2/thread.pyi index 2f0483ff5..eb4e6d6d3 100644 --- a/stdlib/2/thread.pyi +++ b/stdlib/2/thread.pyi @@ -15,11 +15,8 @@ class LockType: def __enter__(self) -> LockType: ... def __exit__(self, typ: Any, value: Any, traceback: Any) -> None: ... -class _local(object): - pass - -class _localdummy(object): - pass +class _local(object): ... +class _localdummy(object): ... def start_new(function: Callable[..., Any], args: Any, kwargs: Any = ...) -> int: ... def start_new_thread(function: Callable[..., Any], args: Any, kwargs: Any = ...) -> int: ... diff --git a/stdlib/2/tokenize.pyi b/stdlib/2/tokenize.pyi index 3822d4676..c7ee7dba7 100644 --- a/stdlib/2/tokenize.pyi +++ b/stdlib/2/tokenize.pyi @@ -122,11 +122,9 @@ def tokenize(readline: Callable[[], str], tokeneater: Callable[[Tuple[int, str, def tokenize_loop(readline: Callable[[], str], tokeneater: Callable[[Tuple[int, str, _Pos, _Pos, str]], None]) -> None: ... def untokenize(iterable: Iterable[_TokenType]) -> str: ... -class StopTokenizing(Exception): - pass +class StopTokenizing(Exception): ... -class TokenError(Exception): - pass +class TokenError(Exception): ... class Untokenizer: prev_col = ... # type: int diff --git a/stdlib/2and3/ctypes/__init__.pyi b/stdlib/2and3/ctypes/__init__.pyi index a258c489e..8bd538af6 100644 --- a/stdlib/2and3/ctypes/__init__.pyi +++ b/stdlib/2and3/ctypes/__init__.pyi @@ -66,7 +66,7 @@ class _CData(metaclass=_CDataMeta): @classmethod def in_dll(cls: Type[_CT], library: CDLL, name: str) -> _CT: ... -class _PointerLike(_CData): pass +class _PointerLike(_CData): ... _ECT = Callable[[Optional[Type[_CData]], _FuncPointer, @@ -240,10 +240,10 @@ class _StructUnionBase(_CData, metaclass=_StructUnionMeta): def __getattr__(self, name: str) -> Any: ... def __setattr__(self, name: str, value: Any) -> None: ... -class Union(_StructUnionBase): pass -class Structure(_StructUnionBase): pass -class BigEndianStructure(Structure): pass -class LittleEndianStructure(Structure): pass +class Union(_StructUnionBase): ... +class Structure(_StructUnionBase): ... +class BigEndianStructure(Structure): ... +class LittleEndianStructure(Structure): ... class Array(Generic[_T], _CData): _length_: ClassVar[int] = ... diff --git a/stdlib/2and3/poplib.pyi b/stdlib/2and3/poplib.pyi index 0b2b49d67..d2b7dab6c 100644 --- a/stdlib/2and3/poplib.pyi +++ b/stdlib/2and3/poplib.pyi @@ -10,7 +10,7 @@ from typing import ( _LongResp = Tuple[bytes, List[bytes], int] -class error_proto(Exception): pass +class error_proto(Exception): ... POP3_PORT: int POP3_SSL_PORT: int diff --git a/stdlib/2and3/threading.pyi b/stdlib/2and3/threading.pyi index 080fe28b1..a5edf6a4a 100644 --- a/stdlib/2and3/threading.pyi +++ b/stdlib/2and3/threading.pyi @@ -75,8 +75,7 @@ class Thread: def setDaemon(self, daemonic: bool) -> None: ... -class _DummyThread(Thread): - pass +class _DummyThread(Thread): ... class Lock: diff --git a/stdlib/3/abc.pyi b/stdlib/3/abc.pyi index c86660b52..9a442f292 100644 --- a/stdlib/3/abc.pyi +++ b/stdlib/3/abc.pyi @@ -14,6 +14,6 @@ class abstractproperty(property): ... def abstractstaticmethod(callable: _FuncT) -> _FuncT: ... def abstractclassmethod(callable: _FuncT) -> _FuncT: ... -class ABC(metaclass=ABCMeta): - pass +class ABC(metaclass=ABCMeta): ... + def get_cache_token() -> object: ... diff --git a/stdlib/3/configparser.pyi b/stdlib/3/configparser.pyi index 440ad8cf4..16c063ac2 100644 --- a/stdlib/3/configparser.pyi +++ b/stdlib/3/configparser.pyi @@ -184,12 +184,10 @@ class ConverterMapping(MutableMapping[str, Optional[_converter]]): def __len__(self) -> int: ... -class Error(Exception): - pass +class Error(Exception): ... -class NoSectionError(Error): - pass +class NoSectionError(Error): ... class DuplicateSectionError(Error): @@ -215,16 +213,14 @@ class InterpolationError(Error): option = ... # type: str -class InterpolationDepthError(InterpolationError): - pass +class InterpolationDepthError(InterpolationError): ... class InterpolationMissingOptionError(InterpolationError): reference = ... # type: str -class InterpolationSyntaxError(InterpolationError): - pass +class InterpolationSyntaxError(InterpolationError): ... class ParsingError(Error): diff --git a/stdlib/3/getpass.pyi b/stdlib/3/getpass.pyi index 71df3765b..55a8433fc 100644 --- a/stdlib/3/getpass.pyi +++ b/stdlib/3/getpass.pyi @@ -9,5 +9,4 @@ def getpass(prompt: str = ..., stream: Optional[TextIO] = ...) -> str: ... def getuser() -> str: ... -class GetPassWarning(UserWarning): - pass +class GetPassWarning(UserWarning): ... diff --git a/stdlib/3/typing.pyi b/stdlib/3/typing.pyi index b8ec829cc..b40317522 100644 --- a/stdlib/3/typing.pyi +++ b/stdlib/3/typing.pyi @@ -177,8 +177,7 @@ class Coroutine(Awaitable[_V_co], Generic[_T_co, _T_contra, _V_co]): # NOTE: This type does not exist in typing.py or PEP 484. # The parameters corrrespond to Generator, but the 4th is the original type. class AwaitableGenerator(Awaitable[_V_co], Generator[_T_co, _T_contra, _V_co], - Generic[_T_co, _T_contra, _V_co, _S], metaclass=ABCMeta): - pass + Generic[_T_co, _T_contra, _V_co, _S], metaclass=ABCMeta): ... @runtime class AsyncIterable(Protocol[_T_co]): diff --git a/third_party/2/pycurl.pyi b/third_party/2/pycurl.pyi index 4272f2839..84ca57cea 100644 --- a/third_party/2/pycurl.pyi +++ b/third_party/2/pycurl.pyi @@ -17,8 +17,7 @@ version = ... # type: str def version_info() -> Tuple[int, str, int, str, int, str, int, str, tuple, Any, int, Any]: ... -class error(Exception): - pass +class error(Exception): ... class Curl(object): def close(self) -> None: ... diff --git a/third_party/2and3/google/protobuf/internal/containers.pyi b/third_party/2and3/google/protobuf/internal/containers.pyi index 12aa39d1e..33e603c93 100644 --- a/third_party/2and3/google/protobuf/internal/containers.pyi +++ b/third_party/2and3/google/protobuf/internal/containers.pyi @@ -48,11 +48,7 @@ class RepeatedCompositeFieldContainer(BaseContainer[_T]): def __delslice__(self, start: int, stop: int) -> None: ... # Classes not yet typed -class Mapping(Any): - pass -class MutableMapping(Mapping): - pass -class ScalarMap(MutableMapping): - pass -class MessageMap(MutableMapping): - pass +class Mapping(Any): ... +class MutableMapping(Mapping): ... +class ScalarMap(MutableMapping): ... +class MessageMap(MutableMapping): ... diff --git a/third_party/2and3/pynamodb/exceptions.pyi b/third_party/2and3/pynamodb/exceptions.pyi index cfd17ac65..728db4a7b 100644 --- a/third_party/2and3/pynamodb/exceptions.pyi +++ b/third_party/2and3/pynamodb/exceptions.pyi @@ -5,32 +5,15 @@ class PynamoDBException(Exception): cause: Any def __init__(self, msg: Optional[Text] = ..., cause: Optional[Exception] = ...) -> None: ... -class PynamoDBConnectionError(PynamoDBException): - pass - -class DeleteError(PynamoDBConnectionError): - pass - -class QueryError(PynamoDBConnectionError): - pass - -class ScanError(PynamoDBConnectionError): - pass - -class PutError(PynamoDBConnectionError): - pass - -class UpdateError(PynamoDBConnectionError): - pass - -class GetError(PynamoDBConnectionError): - pass - -class TableError(PynamoDBConnectionError): - pass - -class DoesNotExist(PynamoDBException): - pass +class PynamoDBConnectionError(PynamoDBException): ... +class DeleteError(PynamoDBConnectionError): ... +class QueryError(PynamoDBConnectionError): ... +class ScanError(PynamoDBConnectionError): ... +class PutError(PynamoDBConnectionError): ... +class UpdateError(PynamoDBConnectionError): ... +class GetError(PynamoDBConnectionError): ... +class TableError(PynamoDBConnectionError): ... +class DoesNotExist(PynamoDBException): ... class TableDoesNotExist(PynamoDBException): def __init__(self, table_name) -> None: ... diff --git a/third_party/3/jwt/__init__.pyi b/third_party/3/jwt/__init__.pyi index 3161c9142..3fca1103b 100644 --- a/third_party/3/jwt/__init__.pyi +++ b/third_party/3/jwt/__init__.pyi @@ -16,15 +16,15 @@ def register_algorithm(alg_id: str, def unregister_algorithm(alg_id: str) -> None: ... -class InvalidTokenError(Exception): pass -class DecodeError(InvalidTokenError): pass -class ExpiredSignatureError(InvalidTokenError): pass -class InvalidAudienceError(InvalidTokenError): pass -class InvalidIssuerError(InvalidTokenError): pass -class InvalidIssuedAtError(InvalidTokenError): pass -class ImmatureSignatureError(InvalidTokenError): pass -class InvalidKeyError(Exception): pass -class InvalidAlgorithmError(InvalidTokenError): pass +class InvalidTokenError(Exception): ... +class DecodeError(InvalidTokenError): ... +class ExpiredSignatureError(InvalidTokenError): ... +class InvalidAudienceError(InvalidTokenError): ... +class InvalidIssuerError(InvalidTokenError): ... +class InvalidIssuedAtError(InvalidTokenError): ... +class ImmatureSignatureError(InvalidTokenError): ... +class InvalidKeyError(Exception): ... +class InvalidAlgorithmError(InvalidTokenError): ... class MissingRequiredClaimError(InvalidTokenError): ... # Compatibility aliases (deprecated)