One case is optional per the spec, add another case

Author: srittau

conformance/results/mypy/qualifiers_final_annotation.toml

@@ -7,45 +7,46 @@ Does not report modification of local `Final` variable via `for` statement.
 """
 output = """
 qualifiers_final_annotation.py:20: error: Argument 1 to "expects_one" has incompatible type "int"; expected "Literal[1]"  [arg-type]
-qualifiers_final_annotation.py:31: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
-qualifiers_final_annotation.py:33: error: Final[...] takes at most one type argument  [misc]
-qualifiers_final_annotation.py:49: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
-qualifiers_final_annotation.py:53: error: Final name must be initialized with a value  [misc]
-qualifiers_final_annotation.py:69: error: Cannot assign to final attribute "ID5"  [misc]
-qualifiers_final_annotation.py:74: error: Cannot assign to final attribute "ID6"  [misc]
-qualifiers_final_annotation.py:77: error: Can only declare a final attribute in class body or __init__  [misc]
+qualifiers_final_annotation.py:23: error: Argument 1 to "expects_one" has incompatible type "int"; expected "Literal[1]"  [arg-type]
+qualifiers_final_annotation.py:32: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
+qualifiers_final_annotation.py:34: error: Final[...] takes at most one type argument  [misc]
+qualifiers_final_annotation.py:50: error: Type in Final[...] can only be omitted if there is an initializer  [misc]
+qualifiers_final_annotation.py:54: error: Final name must be initialized with a value  [misc]
+qualifiers_final_annotation.py:70: error: Cannot assign to final attribute "ID5"  [misc]
+qualifiers_final_annotation.py:75: error: Cannot assign to final attribute "ID6"  [misc]
 qualifiers_final_annotation.py:78: error: Can only declare a final attribute in class body or __init__  [misc]
-qualifiers_final_annotation.py:80: error: Cannot assign to final attribute "ID7"  [misc]
-qualifiers_final_annotation.py:82: error: Cannot assign to final attribute "ID7"  [misc]
-qualifiers_final_annotation.py:86: error: Cannot assign to final name "RATE"  [misc]
-qualifiers_final_annotation.py:96: error: Cannot assign to final attribute "DEFAULT_ID"  [misc]
-qualifiers_final_annotation.py:109: error: Cannot assign to final name "BORDER_WIDTH"  [misc]
-qualifiers_final_annotation.py:111: error: Cannot assign to final name "__private"  [misc]
-qualifiers_final_annotation.py:122: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
-qualifiers_final_annotation.py:123: error: Variable should not be annotated with both ClassVar and Final  [misc]
-qualifiers_final_annotation.py:133: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
-qualifiers_final_annotation.py:136: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
-qualifiers_final_annotation.py:146: error: Final[...] can't be used inside a TypedDict  [valid-type]
-qualifiers_final_annotation.py:151: error: Final[...] can't be used inside a NamedTuple  [valid-type]
-qualifiers_final_annotation.py:160: error: Invalid "NamedTuple()" field name  [misc]
-qualifiers_final_annotation.py:162: error: Unexpected keyword argument "x" for "N"  [call-arg]
-qualifiers_final_annotation.py:162: error: Unexpected keyword argument "y" for "N"  [call-arg]
-qualifiers_final_annotation.py:163: error: Unexpected keyword argument "a" for "N"  [call-arg]
-qualifiers_final_annotation.py:164: error: Unexpected keyword argument "x" for "N"  [call-arg]
-qualifiers_final_annotation.py:164: error: Unexpected keyword argument "y" for "N"  [call-arg]
-qualifiers_final_annotation.py:170: error: Cannot assign to final name "ID1"  [misc]
-qualifiers_final_annotation.py:174: error: Cannot assign to final name "x"  [misc]
-qualifiers_final_annotation.py:176: error: Cannot assign to final name "x"  [misc]
-qualifiers_final_annotation.py:181: error: Incompatible types in assignment (expression has type "TextIOWrapper[_WrappedBuffer]", variable has type "int")  [assignment]
-qualifiers_final_annotation.py:184: error: Cannot assign to final name "x"  [misc]
-qualifiers_final_annotation.py:195: error: Cannot assign to final name "TEN"  [misc]
-qualifiers_final_annotation.py:199: error: Cannot assign to final name "PI"  [misc]
+qualifiers_final_annotation.py:79: error: Can only declare a final attribute in class body or __init__  [misc]
+qualifiers_final_annotation.py:81: error: Cannot assign to final attribute "ID7"  [misc]
+qualifiers_final_annotation.py:83: error: Cannot assign to final attribute "ID7"  [misc]
+qualifiers_final_annotation.py:87: error: Cannot assign to final name "RATE"  [misc]
+qualifiers_final_annotation.py:97: error: Cannot assign to final attribute "DEFAULT_ID"  [misc]
+qualifiers_final_annotation.py:110: error: Cannot assign to final name "BORDER_WIDTH"  [misc]
+qualifiers_final_annotation.py:112: error: Cannot assign to final name "__private"  [misc]
+qualifiers_final_annotation.py:123: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
+qualifiers_final_annotation.py:124: error: Variable should not be annotated with both ClassVar and Final  [misc]
+qualifiers_final_annotation.py:134: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
+qualifiers_final_annotation.py:137: error: Final can be only used as an outermost qualifier in a variable annotation  [valid-type]
+qualifiers_final_annotation.py:147: error: Final[...] can't be used inside a TypedDict  [valid-type]
+qualifiers_final_annotation.py:152: error: Final[...] can't be used inside a NamedTuple  [valid-type]
+qualifiers_final_annotation.py:161: error: Invalid "NamedTuple()" field name  [misc]
+qualifiers_final_annotation.py:163: error: Unexpected keyword argument "x" for "N"  [call-arg]
+qualifiers_final_annotation.py:163: error: Unexpected keyword argument "y" for "N"  [call-arg]
+qualifiers_final_annotation.py:164: error: Unexpected keyword argument "a" for "N"  [call-arg]
+qualifiers_final_annotation.py:165: error: Unexpected keyword argument "x" for "N"  [call-arg]
+qualifiers_final_annotation.py:165: error: Unexpected keyword argument "y" for "N"  [call-arg]
+qualifiers_final_annotation.py:171: error: Cannot assign to final name "ID1"  [misc]
+qualifiers_final_annotation.py:175: error: Cannot assign to final name "x"  [misc]
+qualifiers_final_annotation.py:177: error: Cannot assign to final name "x"  [misc]
+qualifiers_final_annotation.py:182: error: Incompatible types in assignment (expression has type "TextIOWrapper[_WrappedBuffer]", variable has type "int")  [assignment]
+qualifiers_final_annotation.py:185: error: Cannot assign to final name "x"  [misc]
+qualifiers_final_annotation.py:196: error: Cannot assign to final name "TEN"  [misc]
+qualifiers_final_annotation.py:200: error: Cannot assign to final name "PI"  [misc]
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 178: Expected 1 errors
-Line 74: Unexpected errors ['qualifiers_final_annotation.py:74: error: Cannot assign to final attribute "ID6"  [misc]']
-Line 111: Unexpected errors ['qualifiers_final_annotation.py:111: error: Cannot assign to final name "__private"  [misc]']
-Line 160: Unexpected errors ['qualifiers_final_annotation.py:160: error: Invalid "NamedTuple()" field name  [misc]']
-Line 162: Unexpected errors ['qualifiers_final_annotation.py:162: error: Unexpected keyword argument "x" for "N"  [call-arg]', 'qualifiers_final_annotation.py:162: error: Unexpected keyword argument "y" for "N"  [call-arg]']
+Line 179: Expected 1 errors
+Line 75: Unexpected errors ['qualifiers_final_annotation.py:75: error: Cannot assign to final attribute "ID6"  [misc]']
+Line 112: Unexpected errors ['qualifiers_final_annotation.py:112: error: Cannot assign to final name "__private"  [misc]']
+Line 161: Unexpected errors ['qualifiers_final_annotation.py:161: error: Invalid "NamedTuple()" field name  [misc]']
+Line 163: Unexpected errors ['qualifiers_final_annotation.py:163: error: Unexpected keyword argument "x" for "N"  [call-arg]', 'qualifiers_final_annotation.py:163: error: Unexpected keyword argument "y" for "N"  [call-arg]']
 """

conformance/results/pycroscope/qualifiers_final_annotation.toml

@@ -1,42 +1,38 @@
-conformant = "Partial"
-notes = """
-Infers invalid `Literal[range(0, 1)]` from `Final`
-"""
-conformance_automated = "Fail"
+conformance_automated = "Pass"
 errors_diff = """
-Line 25: Unexpected errors ['./qualifiers_final_annotation.py:25:12:   Literal[range(0, 1)] is not equivalent to range']
 """
 output = """
 ./qualifiers_final_annotation.py:20:12: Incompatible argument type for x: expected Literal[1] but got int [incompatible_argument]
-./qualifiers_final_annotation.py:25:12:   Literal[range(0, 1)] is not equivalent to range
-./qualifiers_final_annotation.py:31:6: Final annotation without assignment requires an explicit type [invalid_qualifier]
-./qualifiers_final_annotation.py:33:6: Invalid type annotation (<class 'str'>, <class 'int'>) [invalid_annotation]
-./qualifiers_final_annotation.py:49:9: Final annotation without assignment requires an explicit type [invalid_qualifier]
-./qualifiers_final_annotation.py:49:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:53:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:69:8: Cannot assign to final name ID5 [incompatible_assignment]
-./qualifiers_final_annotation.py:77:18: Final instance attributes may be declared only in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:23:12: Incompatible argument type for x: expected Literal[1] but got int [incompatible_argument]
+./qualifiers_final_annotation.py:26:12:   Literal[range(0, 1)] is not equivalent to range
+./qualifiers_final_annotation.py:32:6: Final annotation without assignment requires an explicit type [invalid_qualifier]
+./qualifiers_final_annotation.py:34:6: Invalid type annotation (<class 'str'>, <class 'int'>) [invalid_annotation]
+./qualifiers_final_annotation.py:50:9: Final annotation without assignment requires an explicit type [invalid_qualifier]
+./qualifiers_final_annotation.py:50:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:54:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:70:8: Cannot assign to final name ID5 [incompatible_assignment]
 ./qualifiers_final_annotation.py:78:18: Final instance attributes may be declared only in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:80:8: Cannot assign to final name ID7 [incompatible_assignment]
-./qualifiers_final_annotation.py:82:8: Cannot assign to final name ID7 [incompatible_assignment]
-./qualifiers_final_annotation.py:86:0: Cannot assign to final name RATE [incompatible_assignment]
-./qualifiers_final_annotation.py:96:0: Cannot assign to final name DEFAULT_ID [incompatible_assignment]
-./qualifiers_final_annotation.py:109:4: Cannot override final attribute BORDER_WIDTH [incompatible_override]
-./qualifiers_final_annotation.py:122:12: Final cannot be combined with ClassVar [invalid_qualifier]
+./qualifiers_final_annotation.py:79:18: Final instance attributes may be declared only in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:81:8: Cannot assign to final name ID7 [incompatible_assignment]
+./qualifiers_final_annotation.py:83:8: Cannot assign to final name ID7 [incompatible_assignment]
+./qualifiers_final_annotation.py:87:0: Cannot assign to final name RATE [incompatible_assignment]
+./qualifiers_final_annotation.py:97:0: Cannot assign to final name DEFAULT_ID [incompatible_assignment]
+./qualifiers_final_annotation.py:110:4: Cannot override final attribute BORDER_WIDTH [incompatible_override]
 ./qualifiers_final_annotation.py:123:12: Final cannot be combined with ClassVar [invalid_qualifier]
-./qualifiers_final_annotation.py:133:3: Unrecognized annotation typing.Final[<class 'int'>] [invalid_annotation]
-./qualifiers_final_annotation.py:136:13: Unexpected Final annotation [invalid_qualifier]
-./qualifiers_final_annotation.py:146:7: Unexpected Final annotation [invalid_qualifier]
-./qualifiers_final_annotation.py:151:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
-./qualifiers_final_annotation.py:163:0: In call to pycroscope.signature.N: Missing required argument 'x' [incompatible_call]
-./qualifiers_final_annotation.py:164:4: Incompatible argument type for x: expected int but got Literal[''] [incompatible_argument]
-./qualifiers_final_annotation.py:164:10: Incompatible argument type for y: expected int but got Literal[''] [incompatible_argument]
-./qualifiers_final_annotation.py:170:4: Cannot assign to final name ID1 [incompatible_assignment]
-./qualifiers_final_annotation.py:174:4: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:176:9: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:178:8: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:181:29: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:184:8: Cannot assign to final name x [incompatible_assignment]
-./qualifiers_final_annotation.py:195:0: Cannot assign to final name TEN [incompatible_assignment]
-./qualifiers_final_annotation.py:199:0: Cannot assign to final name PI [incompatible_assignment]
+./qualifiers_final_annotation.py:124:12: Final cannot be combined with ClassVar [invalid_qualifier]
+./qualifiers_final_annotation.py:134:3: Unrecognized annotation typing.Final[<class 'int'>] [invalid_annotation]
+./qualifiers_final_annotation.py:137:13: Unexpected Final annotation [invalid_qualifier]
+./qualifiers_final_annotation.py:147:7: Unexpected Final annotation [invalid_qualifier]
+./qualifiers_final_annotation.py:152:4: Final class attributes without initializers must be assigned in __init__ [invalid_qualifier]
+./qualifiers_final_annotation.py:164:0: In call to pycroscope.signature.N: Missing required argument 'x' [incompatible_call]
+./qualifiers_final_annotation.py:165:4: Incompatible argument type for x: expected int but got Literal[''] [incompatible_argument]
+./qualifiers_final_annotation.py:165:10: Incompatible argument type for y: expected int but got Literal[''] [incompatible_argument]
+./qualifiers_final_annotation.py:171:4: Cannot assign to final name ID1 [incompatible_assignment]
+./qualifiers_final_annotation.py:175:4: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:177:9: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:179:8: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:182:29: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:185:8: Cannot assign to final name x [incompatible_assignment]
+./qualifiers_final_annotation.py:196:0: Cannot assign to final name TEN [incompatible_assignment]
+./qualifiers_final_annotation.py:200:0: Cannot assign to final name PI [incompatible_assignment]
 """