get rid of Y090 and Y091

CHANGELOG.rst

@@ -4,6 +4,9 @@ Change Log
 unreleased
 ~~~~~~~~~~
 
+* extend Y010 to cover what was previously included in Y090 (disallow
+  assignments in ``__init__`` methods) and Y091 (disallow ``raise``
+  statements). The previous checks were disabled by default.
 * detect usage of non-integer indices in sys.version_info checks
 * extend Y010 to check async functions in addition to normal functions 
 * introduce Y093 (require using TypeAlias for type aliases)

README.rst

@@ -57,8 +57,7 @@ currently emitted:
 * Y009: Empty body should contain "...", not "pass". This is just a stylistic
   choice, but it's the one typeshed made.
 * Y010: Function body must contain only "...". Stub files should not contain
-  code, so function bodies should be empty. Currently, we make exceptions for
-  raise statements and for assignments in `__init__` methods.
+  code, so function bodies should be empty.
 * Y011: All default values for typed function arguments must be "...". Type
   checkers ignore the default value, so the default value is not useful
   information in a stub file.
@@ -75,20 +74,6 @@ currently emitted:
 
 The following warnings are disabled by default:
 
-* Y090: Use explicit attributes instead of assignments in `__init__`. This
-  is a stricter version of Y010. Instead of::
-
-    class Thing:
-        def __init__(self, x: str) -> None:
-            self.x = x
-
-  you should write::
-
-     class Thing:
-         x: str
-         def __init__(self, x: str) -> None: ...
-
-* Y091: Function body must not contain "raise".
 * Y092: Top-level attribute must not have a default value.
 * Y093: Type aliases should be explicitly demarcated with ``typing.TypeAlias``.
 

pyi.py

@@ -440,15 +440,6 @@ def _visit_function(self, node: ast.FunctionDef | ast.AsyncFunctionDef) -> None:
                     statement.value, ast.Ellipsis
                 ):
                     continue
-            # special-case raise for backwards compatibility
-            if isinstance(statement, ast.Raise):
-                self.error(statement, Y091)
-                continue
-            # allow assignments in constructor for now
-            # (though these should probably be changed)
-            if node.name == "__init__":
-                self.error(statement, Y090)
-                continue
             self.error(statement, Y010)
 
     def visit_arguments(self, node: ast.arguments) -> None:
@@ -569,9 +560,7 @@ def should_warn(self, code):
 Y016 = "Y016 Duplicate union member"
 Y017 = "Y017 Only simple assignments allowed"
 Y018 = 'Y018 {typevarlike_cls} "{typevar_name}" is not used'
-Y090 = "Y090 Use explicit attributes instead of assignments in __init__"
-Y091 = 'Y091 Function body must not contain "raise"'
 Y092 = "Y092 Top-level attribute must not have a default value"
 Y093 = "Y093 Use typing_extensions.TypeAlias for type aliases"
 
-DISABLED_BY_DEFAULT = [Y090, Y091, Y092, Y093]
+DISABLED_BY_DEFAULT = [Y092, Y093]

tests/emptyfunctions.pyi

@@ -5,15 +5,18 @@ def passing(x: int) -> float:
     pass  # Y009 Empty body should contain "...", not "pass"
 
 def raising(x: int) -> float:
-    raise TypeError
+    raise TypeError  # Y010 Function body must contain only "..."
 
-class GoodClass:
+class BadClass:
     def __init__(self, x: int) -> None:
-        self.x = x
+        self.x = x  # Y010 Function body must contain only "..."
 
-class BadClass:
-    def __init__(self, b: GoodClass, x: int) -> None:
-        b.x = x
+    async def async_assign(self, x: int) -> None:
+        self.x = x  # Y010 Function body must contain only "..."
+
+class WorseClass:
+    def __init__(self, b: BadClass, x: int) -> None:
+        b.x = x  # Y010 Function body must contain only "..."
 
 def returning(x: int) -> float:
     return x / 2  # Y010 Function body must contain only "..."
@@ -29,7 +32,7 @@ async def passing_async(x: int) -> float:
     pass  # Y009 Empty body should contain "...", not "pass"
 
 async def raising_async(x: int) -> float:
-    raise TypeError
+    raise TypeError  # Y010 Function body must contain only "..."
 
 async def returning_async(x: int) -> float:
     return x / 2  # Y010 Function body must contain only "..."