From 06c682449fc043e9c1d3648e431373ec21ef0cf6 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Sat, 9 Mar 2019 18:17:55 -0800 Subject: [PATCH] Fix inconsistent self/cls parameter names (#2838) Fixed several inconsistent parameter names so all instance methods take 'self' and all class methods take 'cls'. This avoids warnings or errors from linting tools that enforce standard naming conventions. --- third_party/2and3/flask/views.pyi | 2 +- third_party/2and3/google/protobuf/descriptor.pyi | 2 +- third_party/2and3/google/protobuf/reflection.pyi | 2 +- third_party/2and3/jinja2/compiler.pyi | 4 ++-- third_party/2and3/pynamodb/attributes.pyi | 2 +- third_party/2and3/pynamodb/indexes.pyi | 2 +- third_party/2and3/requests/packages/urllib3/response.pyi | 2 +- third_party/2and3/yaml/__init__.pyi | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/third_party/2and3/flask/views.pyi b/third_party/2and3/flask/views.pyi index 3dd9bbca1..a2637b3b0 100644 --- a/third_party/2and3/flask/views.pyi +++ b/third_party/2and3/flask/views.pyi @@ -16,7 +16,7 @@ class View: def as_view(cls, name: Any, *class_args: Any, **class_kwargs: Any): ... class MethodViewType(type): - def __init__(cls, name: Any, bases: Any, d: Any) -> None: ... + def __init__(self, name: Any, bases: Any, d: Any) -> None: ... class MethodView(View, metaclass=MethodViewType): def dispatch_request(self, *args: Any, **kwargs: Any) -> Any: ... diff --git a/third_party/2and3/google/protobuf/descriptor.pyi b/third_party/2and3/google/protobuf/descriptor.pyi index cd5614fd4..d6d62fe87 100644 --- a/third_party/2and3/google/protobuf/descriptor.pyi +++ b/third_party/2and3/google/protobuf/descriptor.pyi @@ -16,7 +16,7 @@ class Error(Exception): ... class TypeTransformationError(Error): ... class DescriptorMetaclass(type): - def __instancecheck__(cls, obj): ... + def __instancecheck__(self, obj): ... class DescriptorBase(metaclass=DescriptorMetaclass): has_options = ... # type: Any diff --git a/third_party/2and3/google/protobuf/reflection.pyi b/third_party/2and3/google/protobuf/reflection.pyi index d32a93dc0..3ca50552a 100644 --- a/third_party/2and3/google/protobuf/reflection.pyi +++ b/third_party/2and3/google/protobuf/reflection.pyi @@ -1,6 +1,6 @@ class GeneratedProtocolMessageType(type): def __new__(cls, name, bases, dictionary): ... - def __init__(cls, name, bases, dictionary) -> None: ... + def __init__(self, name, bases, dictionary) -> None: ... def ParseMessage(descriptor, byte_str): ... def MakeClass(descriptor): ... diff --git a/third_party/2and3/jinja2/compiler.pyi b/third_party/2and3/jinja2/compiler.pyi index 09883e82c..8f8b59321 100644 --- a/third_party/2and3/jinja2/compiler.pyi +++ b/third_party/2and3/jinja2/compiler.pyi @@ -137,8 +137,8 @@ class CodeGenerator(NodeVisitor): def visit_Tuple(self, node, frame): ... def visit_List(self, node, frame): ... def visit_Dict(self, node, frame): ... - def binop(operator, interceptable: bool = ...): ... - def uaop(operator, interceptable: bool = ...): ... + def binop(self, interceptable: bool = ...): ... + def uaop(self, interceptable: bool = ...): ... visit_Add = ... # type: Any visit_Sub = ... # type: Any visit_Mul = ... # type: Any diff --git a/third_party/2and3/pynamodb/attributes.pyi b/third_party/2and3/pynamodb/attributes.pyi index f2a2c8e82..3c8247435 100644 --- a/third_party/2and3/pynamodb/attributes.pyi +++ b/third_party/2and3/pynamodb/attributes.pyi @@ -73,7 +73,7 @@ class NullAttribute(Attribute[None]): def __get__(self, instance: Any, owner: Any) -> None: ... class MapAttributeMeta(type): - def __init__(cls, name, bases, attrs) -> None: ... + def __init__(self, name, bases, attrs) -> None: ... class MapAttribute(Generic[_KT, _VT], Attribute[Mapping[_KT, _VT]], metaclass=MapAttributeMeta): attribute_values: Any diff --git a/third_party/2and3/pynamodb/indexes.pyi b/third_party/2and3/pynamodb/indexes.pyi index 35506d097..66e8ae772 100644 --- a/third_party/2and3/pynamodb/indexes.pyi +++ b/third_party/2and3/pynamodb/indexes.pyi @@ -1,7 +1,7 @@ from typing import Any, Optional class IndexMeta(type): - def __init__(cls, name, bases, attrs) -> None: ... + def __init__(self, name, bases, attrs) -> None: ... class Index(metaclass=IndexMeta): Meta: Any diff --git a/third_party/2and3/requests/packages/urllib3/response.pyi b/third_party/2and3/requests/packages/urllib3/response.pyi index 8a8099147..d8144ddbb 100644 --- a/third_party/2and3/requests/packages/urllib3/response.pyi +++ b/third_party/2and3/requests/packages/urllib3/response.pyi @@ -41,7 +41,7 @@ class HTTPResponse(io.IOBase): def read(self, amt=..., decode_content=..., cache_content=...): ... def stream(self, amt=..., decode_content=...): ... @classmethod - def from_httplib(ResponseCls, r, **response_kw): ... + def from_httplib(cls, r, **response_kw): ... def getheaders(self): ... def getheader(self, name, default=...): ... def close(self): ... diff --git a/third_party/2and3/yaml/__init__.pyi b/third_party/2and3/yaml/__init__.pyi index 6e0342d77..7e17013b2 100644 --- a/third_party/2and3/yaml/__init__.pyi +++ b/third_party/2and3/yaml/__init__.pyi @@ -34,7 +34,7 @@ def add_representer(data_type, representer, Dumper=...): ... def add_multi_representer(data_type, multi_representer, Dumper=...): ... class YAMLObjectMetaclass(type): - def __init__(cls, name, bases, kwds) -> None: ... + def __init__(self, name, bases, kwds) -> None: ... class YAMLObject(metaclass=YAMLObjectMetaclass): yaml_loader = ... # type: Any