diff --git a/CHANGELOG.md b/CHANGELOG.md index 01c3ed16ddbb..bae57dd1b0e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -184,7 +184,7 @@ This was contributed by Marc Mueller (PR [18014](https://github.com/python/mypy/ * Improve contributor documentation for Windows (ag-tafe, PR [18097](https://github.com/python/mypy/pull/18097)) * Correct note about `--disallow-any-generics` flag in documentation (Abel Sen, PR [18055](https://github.com/python/mypy/pull/18055)) * Further caution against `--follow-imports=skip` (Shantanu, PR [18048](https://github.com/python/mypy/pull/18048)) - * Fix the edit page buttton link in documentation (Kanishk Pachauri, PR [17933](https://github.com/python/mypy/pull/17933)) + * Fix the edit page button link in documentation (Kanishk Pachauri, PR [17933](https://github.com/python/mypy/pull/17933)) ### Other Notables Fixes and Improvements @@ -751,7 +751,7 @@ This feature was contributed by Jukka Lehtosalo (PR [17404](https://github.com/p ### Mypyc Improvements -Mypyc now supports the new syntax for generics introduced in Python 3.12 (see above). Another notable improvement is signficantly faster basic operations on `int` values. +Mypyc now supports the new syntax for generics introduced in Python 3.12 (see above). Another notable improvement is significantly faster basic operations on `int` values. * Support Python 3.12 syntax for generic functions and classes (Jukka Lehtosalo, PR [17357](https://github.com/python/mypy/pull/17357)) * Support Python 3.12 type alias syntax (Jukka Lehtosalo, PR [17384](https://github.com/python/mypy/pull/17384)) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 24f7e516e9e2..89d667dfb6ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,7 @@ articulated in the [Python Community Code of Conduct](https://www.python.org/psf #### (1) Fork the mypy repository -Within Github, navigate to and fork the repository. +Within GitHub, navigate to and fork the repository. #### (2) Clone the mypy repository and enter into it diff --git a/docs/source/common_issues.rst b/docs/source/common_issues.rst index 61b71c108ea0..4cb00e55c2f3 100644 --- a/docs/source/common_issues.rst +++ b/docs/source/common_issues.rst @@ -757,7 +757,7 @@ type check such code. Consider this example: x: int = 'abc' # Unreachable -- no error It's easy to see that any statement after ``return`` is unreachable, -and hence mypy will not complain about the mis-typed code below +and hence mypy will not complain about the mistyped code below it. For a more subtle example, consider this code: .. code-block:: python diff --git a/misc/docker/README.md b/misc/docker/README.md index 839f9761cb03..0e9a3a80ff0e 100644 --- a/misc/docker/README.md +++ b/misc/docker/README.md @@ -12,7 +12,7 @@ Why use Docker? Mypyc tests can be significantly faster in a Docker container than running natively on macOS. -Also, if it's inconvient to install the necessary dependencies on the +Also, if it's inconvenient to install the necessary dependencies on the host operating system, or there are issues getting some tests to pass on the host operating system, using a container can be an easy workaround. diff --git a/misc/trigger_wheel_build.sh b/misc/trigger_wheel_build.sh index c914a6e7cf86..a2608d93f349 100755 --- a/misc/trigger_wheel_build.sh +++ b/misc/trigger_wheel_build.sh @@ -3,7 +3,7 @@ # Trigger a build of mypyc compiled mypy wheels by updating the mypy # submodule in the git repo that drives those builds. -# $WHEELS_PUSH_TOKEN is stored in Github Settings and is an API token +# $WHEELS_PUSH_TOKEN is stored in GitHub Settings and is an API token # for the mypy-build-bot account. git config --global user.email "nobody" diff --git a/mypy/checker.py b/mypy/checker.py index 8b7d5207711c..0e7a71999f64 100644 --- a/mypy/checker.py +++ b/mypy/checker.py @@ -2594,7 +2594,7 @@ def check_enum(self, defn: ClassDef) -> None: if isinstance(sym.node, Var) and sym.node.has_explicit_value: # `__members__` will always be overwritten by `Enum` and is considered # read-only so we disallow assigning a value to it - self.fail(message_registry.ENUM_MEMBERS_ATTR_WILL_BE_OVERRIDEN, sym.node) + self.fail(message_registry.ENUM_MEMBERS_ATTR_WILL_BE_OVERRIDDEN, sym.node) for base in defn.info.mro[1:-1]: # we don't need self and `object` if base.is_enum and base.fullname not in ENUM_BASES: self.check_final_enum(defn, base) @@ -3642,7 +3642,7 @@ def is_assignable_slot(self, lvalue: Lvalue, typ: Type | None) -> bool: typ = get_proper_type(typ) if typ is None or isinstance(typ, AnyType): - return True # Any can be literally anything, like `@propery` + return True # Any can be literally anything, like `@property` if isinstance(typ, Instance): # When working with instances, we need to know if they contain # `__set__` special method. Like `@property` does. @@ -8519,7 +8519,7 @@ def group_comparison_operands( x0 == x1 == x2 < x3 < x4 is x5 is x6 is not x7 is not x8 - If we get these expressions in a pairwise way (e.g. by calling ComparisionExpr's + If we get these expressions in a pairwise way (e.g. by calling ComparisonExpr's 'pairwise()' method), we get the following as input: [('==', x0, x1), ('==', x1, x2), ('<', x2, x3), ('<', x3, x4), diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py index adb65a126f38..e52930522e14 100644 --- a/mypy/checkexpr.py +++ b/mypy/checkexpr.py @@ -844,7 +844,7 @@ def validate_typeddict_kwargs( # Having an optional key not explicitly declared by a ** unpacked # TypedDict is unsafe, it may be an (incompatible) subtype at runtime. # TODO: catch the cases where a declared key is overridden by a subsequent - # ** item without it (and not again overriden with complete ** item). + # ** item without it (and not again overridden with complete ** item). self.msg.non_required_keys_absent_with_star(absent_keys, last_star_found) return result, always_present_keys @@ -5353,7 +5353,7 @@ def visit_lambda_expr(self, e: LambdaExpr) -> Type: can_skip=True, fall_through=0 ), self.chk.scope.push_function(e): # Lambdas can have more than one element in body, - # when we add "fictional" AssigmentStatement nodes, like in: + # when we add "fictional" AssignmentStatement nodes, like in: # `lambda (a, b): a` for stmt in e.body.body[:-1]: stmt.accept(self.chk) diff --git a/mypy/dmypy_server.py b/mypy/dmypy_server.py index 70cfaa5b2fb9..10ff07451461 100644 --- a/mypy/dmypy_server.py +++ b/mypy/dmypy_server.py @@ -714,7 +714,7 @@ def refresh_file(module: str, path: str) -> list[str]: find_changes_time=t1 - t0, fg_update_time=t2 - t1, refresh_suppressed_time=t3 - t2, - find_added_supressed_time=t4 - t3, + find_added_suppressed_time=t4 - t3, cleanup_time=t5 - t4, ) diff --git a/mypy/errors.py b/mypy/errors.py index 1b3f485d19c0..0395a3a0d821 100644 --- a/mypy/errors.py +++ b/mypy/errors.py @@ -268,7 +268,7 @@ class Errors: show_column_numbers: bool = False # Set to True to show end line and end column in error messages. - # Ths implies `show_column_numbers`. + # This implies `show_column_numbers`. show_error_end: bool = False # Set to True to show absolute file paths in error messages. diff --git a/mypy/inspections.py b/mypy/inspections.py index 0baf0896f7e5..bc76ab247901 100644 --- a/mypy/inspections.py +++ b/mypy/inspections.py @@ -335,7 +335,7 @@ def expr_attrs(self, expression: Expression) -> tuple[str, bool]: node = expression.node names = sorted(node.names) if "__builtins__" in names: - # This is just to make tests stable. No one will really need ths name. + # This is just to make tests stable. No one will really need this name. names.remove("__builtins__") mod_dict = {f'"<{node.fullname}>"': [f'"{name}"' for name in names]} else: diff --git a/mypy/message_registry.py b/mypy/message_registry.py index 346a677a8e85..0c7464246990 100644 --- a/mypy/message_registry.py +++ b/mypy/message_registry.py @@ -241,7 +241,7 @@ def with_additional_msg(self, info: str) -> ErrorMessage: CANNOT_MAKE_DELETABLE_FINAL: Final = ErrorMessage("Deletable attribute cannot be final") # Enum -ENUM_MEMBERS_ATTR_WILL_BE_OVERRIDEN: Final = ErrorMessage( +ENUM_MEMBERS_ATTR_WILL_BE_OVERRIDDEN: Final = ErrorMessage( 'Assigned "__members__" will be overridden by "Enum" internally' ) diff --git a/mypy/nodes.py b/mypy/nodes.py index 9e26103e2f58..088dc2752b07 100644 --- a/mypy/nodes.py +++ b/mypy/nodes.py @@ -1179,7 +1179,7 @@ def __init__( self.keywords = dict(keywords) if keywords else {} self.analyzed = None self.has_incompatible_baseclass = False - # Used for error reporting (to keep backwad compatibility with pre-3.8) + # Used for error reporting (to keep backward compatibility with pre-3.8) self.deco_line: int | None = None self.docstring: str | None = None self.removed_statements = [] diff --git a/mypy/plugins/common.py b/mypy/plugins/common.py index f0ff6f30a3b9..43caa6483236 100644 --- a/mypy/plugins/common.py +++ b/mypy/plugins/common.py @@ -164,7 +164,7 @@ def find_shallow_matching_overload_item(overload: Overloaded, call: CallExpr) -> def _get_callee_type(call: CallExpr) -> CallableType | None: - """Return the type of the callee, regardless of its syntatic form.""" + """Return the type of the callee, regardless of its syntactic form.""" callee_node: Node | None = call.callee diff --git a/mypy/plugins/enums.py b/mypy/plugins/enums.py index 816241fa6e9a..86e7f1f7b31e 100644 --- a/mypy/plugins/enums.py +++ b/mypy/plugins/enums.py @@ -129,7 +129,7 @@ def _implements_new(info: TypeInfo) -> bool: def enum_member_callback(ctx: mypy.plugin.FunctionContext) -> Type: - """By default `member(1)` will be infered as `member[int]`, + """By default `member(1)` will be inferred as `member[int]`, we want to improve the inference to be `Literal[1]` here.""" if ctx.arg_types or ctx.arg_types[0]: arg = get_proper_type(ctx.arg_types[0][0]) diff --git a/mypy/semanal.py b/mypy/semanal.py index 42803727a958..d554144ee838 100644 --- a/mypy/semanal.py +++ b/mypy/semanal.py @@ -4169,7 +4169,7 @@ def analyze_type_alias_type_params( ) -> tuple[TypeVarLikeList, list[str]]: """Analyze type_params of TypeAliasType. - Returns declared unbound type variable expressions and a list of all decalred type + Returns declared unbound type variable expressions and a list of all declared type variable names for error reporting. """ if "type_params" in rvalue.arg_names: @@ -4435,7 +4435,7 @@ def make_name_lvalue_var( if kind != LDEF: v._fullname = self.qualified_name(name) else: - # fullanme should never stay None + # fullname should never stay None v._fullname = name v.is_ready = False # Type not inferred yet v.has_explicit_value = has_explicit_value @@ -6217,7 +6217,7 @@ def visit_yield_expr(self, e: YieldExpr) -> None: def visit_await_expr(self, expr: AwaitExpr) -> None: if not self.is_func_scope() or not self.function_stack: # We check both because is_function_scope() returns True inside comprehensions. - # This is not a blocker, because some enviroments (like ipython) + # This is not a blocker, because some environments (like ipython) # support top level awaits. self.fail('"await" outside function', expr, serious=True, code=codes.TOP_LEVEL_AWAIT) elif not self.function_stack[-1].is_coroutine: diff --git a/mypy/solve.py b/mypy/solve.py index 8a1495a9a246..4b09baee64c6 100644 --- a/mypy/solve.py +++ b/mypy/solve.py @@ -139,7 +139,7 @@ def solve_with_dependent( * Find dependencies between type variables, group them in SCCs, and sort topologically * Check that all SCC are intrinsically linear, we can't solve (express) T <: List[T] * Variables in leaf SCCs that don't have constant bounds are free (choose one per SCC) - * Solve constraints iteratively starting from leafs, updating bounds after each step. + * Solve constraints iteratively starting from leaves, updating bounds after each step. """ graph, lowers, uppers = transitive_closure(vars, constraints) diff --git a/mypy/stubgenc.py b/mypy/stubgenc.py index 1cd709b9d603..3a2b242638e5 100755 --- a/mypy/stubgenc.py +++ b/mypy/stubgenc.py @@ -241,7 +241,7 @@ def __init__( self.module_name = module_name if self.is_c_module: # Add additional implicit imports. - # C-extensions are given more lattitude since they do not import the typing module. + # C-extensions are given more latitude since they do not import the typing module. self.known_imports.update( { "typing": [ diff --git a/mypy/test/testconstraints.py b/mypy/test/testconstraints.py index a701a173cbaa..277694a328c9 100644 --- a/mypy/test/testconstraints.py +++ b/mypy/test/testconstraints.py @@ -62,7 +62,7 @@ def test_type_var_tuple_with_prefix_and_suffix(self) -> None: Constraint(type_var=fx.s, op=SUPERTYPE_OF, target=fx.d), } - def test_unpack_homogenous_tuple(self) -> None: + def test_unpack_homogeneous_tuple(self) -> None: fx = self.fx assert set( infer_constraints( @@ -77,7 +77,7 @@ def test_unpack_homogenous_tuple(self) -> None: Constraint(type_var=fx.t, op=SUBTYPE_OF, target=fx.b), } - def test_unpack_homogenous_tuple_with_prefix_and_suffix(self) -> None: + def test_unpack_homogeneous_tuple_with_prefix_and_suffix(self) -> None: fx = self.fx assert set( infer_constraints( diff --git a/mypy/test/testinfer.py b/mypy/test/testinfer.py index 08926c179623..107c4d8dc98a 100644 --- a/mypy/test/testinfer.py +++ b/mypy/test/testinfer.py @@ -366,7 +366,7 @@ def test_single_pair(self) -> None: ) def test_empty_pair_list(self) -> None: - # This case should never occur in practice -- ComparisionExprs + # This case should never occur in practice -- ComparisonExprs # always contain at least one comparison. But in case it does... self.assertEqual(group_comparison_operands([], {}, set()), []) diff --git a/mypy/test/testpythoneval.py b/mypy/test/testpythoneval.py index baeea1853ded..32c07087292e 100644 --- a/mypy/test/testpythoneval.py +++ b/mypy/test/testpythoneval.py @@ -63,9 +63,9 @@ def test_python_evaluation(testcase: DataDrivenTestCase, cache_dir: str) -> None additional_flags = m.group(1).split() for flag in additional_flags: if flag.startswith("--python-version="): - targetted_python_version = flag.split("=")[1] - targetted_major, targetted_minor = targetted_python_version.split(".") - if (int(targetted_major), int(targetted_minor)) > ( + targeted_python_version = flag.split("=")[1] + targeted_major, targeted_minor = targeted_python_version.split(".") + if (int(targeted_major), int(targeted_minor)) > ( sys.version_info.major, sys.version_info.minor, ): diff --git a/mypy/test/update_data.py b/mypy/test/update_data.py index 2d66752f61bd..2e1a6a9b3d1d 100644 --- a/mypy/test/update_data.py +++ b/mypy/test/update_data.py @@ -69,7 +69,7 @@ def _iter_fixes( source_line = source_line[: comment_match.start("indent")] # strip old comment if reports: indent = comment_match.group("indent") if comment_match else " " - # multiline comments are on the first line and then on subsequent lines emtpy lines + # multiline comments are on the first line and then on subsequent lines empty lines # with a continuation backslash for j, (severity, msg) in enumerate(reports): out_l = source_line if j == 0 else " " * len(source_line) diff --git a/mypy/typeanal.py b/mypy/typeanal.py index 32aad5ba4089..751ed85ea6f3 100644 --- a/mypy/typeanal.py +++ b/mypy/typeanal.py @@ -1000,7 +1000,7 @@ def analyze_unbound_type_without_type_info( elif unbound_tvar: assert isinstance(sym.node, TypeVarLikeExpr) if sym.node.is_new_style: - # PEP 695 type paramaters are never considered unbound -- they are undefined + # PEP 695 type parameters are never considered unbound -- they are undefined # in contexts where they aren't valid, such as in argument default values. message = 'Name "{}" is not defined' name = name.split(".")[-1] diff --git a/mypy/typeshed/stdlib/_tkinter.pyi b/mypy/typeshed/stdlib/_tkinter.pyi index 4206a2114f95..bd41b9ebc78e 100644 --- a/mypy/typeshed/stdlib/_tkinter.pyi +++ b/mypy/typeshed/stdlib/_tkinter.pyi @@ -82,7 +82,7 @@ class TkappType: def mainloop(self, threshold: int = 0, /): ... def quit(self): ... def record(self, script, /): ... - def setvar(self, *ags, **kwargs): ... + def setvar(self, *args, **kwargs): ... if sys.version_info < (3, 11): def split(self, arg, /): ... diff --git a/mypy/typeshed/stdlib/email/message.pyi b/mypy/typeshed/stdlib/email/message.pyi index ebad05a1cf7b..8993a3217185 100644 --- a/mypy/typeshed/stdlib/email/message.pyi +++ b/mypy/typeshed/stdlib/email/message.pyi @@ -153,7 +153,7 @@ class MIMEPart(Message[_HeaderRegistryT, _HeaderRegistryParamT]): def attach(self, payload: Self) -> None: ... # type: ignore[override] # The attachments are created via type(self) in the attach method. It's theoretically # possible to sneak other attachment types into a MIMEPart instance, but could cause - # cause unforseen consequences. + # cause unforeseen consequences. def iter_attachments(self) -> Iterator[Self]: ... def iter_parts(self) -> Iterator[MIMEPart[_HeaderRegistryT]]: ... def get_content(self, *args: Any, content_manager: ContentManager | None = None, **kw: Any) -> Any: ... diff --git a/mypyc/analysis/attrdefined.py b/mypyc/analysis/attrdefined.py index 350158246cdb..e4038bfaa238 100644 --- a/mypyc/analysis/attrdefined.py +++ b/mypyc/analysis/attrdefined.py @@ -176,7 +176,7 @@ def analyze_always_defined_attrs_in_class(cl: ClassIR, seen: set[ClassIR]) -> No m.blocks, self_reg, maybe_defined, dirty ) - mark_attr_initialiation_ops(m.blocks, self_reg, maybe_defined, dirty) + mark_attr_initialization_ops(m.blocks, self_reg, maybe_defined, dirty) # Check if __init__ can run unpredictable code (leak 'self'). any_dirty = False @@ -260,7 +260,7 @@ def find_sometimes_defined_attributes( return attrs -def mark_attr_initialiation_ops( +def mark_attr_initialization_ops( blocks: list[BasicBlock], self_reg: Register, maybe_defined: AnalysisResult[str], diff --git a/mypyc/codegen/emit.py b/mypyc/codegen/emit.py index fce6896e8d11..97302805fd3b 100644 --- a/mypyc/codegen/emit.py +++ b/mypyc/codegen/emit.py @@ -195,7 +195,7 @@ def attr(self, name: str) -> str: return ATTR_PREFIX + name def object_annotation(self, obj: object, line: str) -> str: - """Build a C comment with an object's string represention. + """Build a C comment with an object's string representation. If the comment exceeds the line length limit, it's wrapped into a multiline string (with the extra lines indented to be aligned with diff --git a/mypyc/irbuild/ll_builder.py b/mypyc/irbuild/ll_builder.py index bbfe14a68c93..7216826906cb 100644 --- a/mypyc/irbuild/ll_builder.py +++ b/mypyc/irbuild/ll_builder.py @@ -1,6 +1,6 @@ """A "low-level" IR builder class. -See the docstring of class LowLevelIRBuiler for more information. +See the docstring of class LowLevelIRBuilder for more information. """ @@ -439,7 +439,7 @@ def coerce_int_to_fixed_width(self, src: Value, target_type: RType, line: int) - size = target_type.size if size < int_rprimitive.size: - # Add a range check when the target type is smaller than the source tyoe + # Add a range check when the target type is smaller than the source type fast2, fast3 = BasicBlock(), BasicBlock() upper_bound = 1 << (size * 8 - 1) if not target_type.is_signed: diff --git a/mypyc/irbuild/match.py b/mypyc/irbuild/match.py index 976a8810b327..ee7b6027bbda 100644 --- a/mypyc/irbuild/match.py +++ b/mypyc/irbuild/match.py @@ -124,7 +124,7 @@ def visit_or_pattern(self, pattern: OrPattern) -> None: def visit_class_pattern(self, pattern: ClassPattern) -> None: # TODO: use faster instance check for native classes (while still - # making sure to account for inheritence) + # making sure to account for inheritance) isinstance_op = ( fast_isinstance_op if self.builder.is_builtin_ref_expr(pattern.class_ref) diff --git a/mypyc/lib-rt/CPy.h b/mypyc/lib-rt/CPy.h index d3637cde49ff..1e6f50306ba1 100644 --- a/mypyc/lib-rt/CPy.h +++ b/mypyc/lib-rt/CPy.h @@ -785,7 +785,7 @@ static inline PyObject *_CPy_FromDummy(PyObject *p) { return p; } -static int CPy_NoErrOccured(void) { +static int CPy_NoErrOccurred(void) { return PyErr_Occurred() == NULL; } @@ -856,7 +856,7 @@ PyObject *CPy_FetchStopIterationValue(void); PyObject *CPyType_FromTemplate(PyObject *template_, PyObject *orig_bases, PyObject *modname); -PyObject *CPyType_FromTemplateWarpper(PyObject *template_, +PyObject *CPyType_FromTemplateWrapper(PyObject *template_, PyObject *orig_bases, PyObject *modname); int CPyDataclass_SleightOfHand(PyObject *dataclass_dec, PyObject *tp, diff --git a/mypyc/lib-rt/int_ops.c b/mypyc/lib-rt/int_ops.c index 9b5d4ef65fb1..b7fff2535c12 100644 --- a/mypyc/lib-rt/int_ops.c +++ b/mypyc/lib-rt/int_ops.c @@ -124,7 +124,7 @@ CPyTagged CPyTagged_Add_(CPyTagged left, CPyTagged right) { return CPyTagged_StealFromObject(result); } -// Tagged int subraction slow path, where the result may be a long integer +// Tagged int subtraction slow path, where the result may be a long integer CPyTagged CPyTagged_Subtract_(CPyTagged left, CPyTagged right) { PyObject *left_obj = CPyTagged_AsObject(left); PyObject *right_obj = CPyTagged_AsObject(right); diff --git a/mypyc/lib-rt/misc_ops.c b/mypyc/lib-rt/misc_ops.c index d3e8e69ed19b..a2b03e7df247 100644 --- a/mypyc/lib-rt/misc_ops.c +++ b/mypyc/lib-rt/misc_ops.c @@ -897,7 +897,7 @@ PyObject *CPySingledispatch_RegisterFunction(PyObject *singledispatch_func, } -// Adapated from ceval.c GET_AITER +// Adapted from ceval.c GET_AITER PyObject *CPy_GetAIter(PyObject *obj) { unaryfunc getter = NULL; @@ -935,7 +935,7 @@ PyObject *CPy_GetAIter(PyObject *obj) return iter; } -// Adapated from ceval.c GET_ANEXT +// Adapted from ceval.c GET_ANEXT PyObject *CPy_GetANext(PyObject *aiter) { unaryfunc getter = NULL; diff --git a/mypyc/primitives/exc_ops.py b/mypyc/primitives/exc_ops.py index ad105056158a..9a5f6392a917 100644 --- a/mypyc/primitives/exc_ops.py +++ b/mypyc/primitives/exc_ops.py @@ -41,7 +41,7 @@ no_err_occurred_op = custom_op( arg_types=[], return_type=bit_rprimitive, - c_function_name="CPy_NoErrOccured", + c_function_name="CPy_NoErrOccurred", error_kind=ERR_FALSE, ) diff --git a/mypyc/primitives/set_ops.py b/mypyc/primitives/set_ops.py index fcfb7847dc7d..a0313861fb30 100644 --- a/mypyc/primitives/set_ops.py +++ b/mypyc/primitives/set_ops.py @@ -22,7 +22,7 @@ # Get the 'builtins.set' type object. load_address_op(name="builtins.set", type=object_rprimitive, src="PySet_Type") -# Get the 'builtins.frozenset' tyoe object. +# Get the 'builtins.frozenset' type object. load_address_op(name="builtins.frozenset", type=object_rprimitive, src="PyFrozenSet_Type") # Construct an empty set. diff --git a/mypyc/test-data/irbuild-basic.test b/mypyc/test-data/irbuild-basic.test index a43e0d0ada56..835543168a6b 100644 --- a/mypyc/test-data/irbuild-basic.test +++ b/mypyc/test-data/irbuild-basic.test @@ -2711,7 +2711,7 @@ L4: L5: goto L1 L6: - r5 = CPy_NoErrOccured() + r5 = CPy_NoErrOccurred() L7: L8: return r0 @@ -2740,7 +2740,7 @@ L4: L5: goto L1 L6: - r6 = CPy_NoErrOccured() + r6 = CPy_NoErrOccurred() L7: L8: return r0 @@ -2780,7 +2780,7 @@ L2: L3: goto L1 L4: - r10 = CPy_NoErrOccured() + r10 = CPy_NoErrOccurred() L5: return r0 @@ -3301,7 +3301,7 @@ L2: L3: goto L1 L4: - r10 = CPy_NoErrOccured() + r10 = CPy_NoErrOccurred() L5: return 1 def range_in_loop(): diff --git a/mypyc/test-data/irbuild-classes.test b/mypyc/test-data/irbuild-classes.test index 2c15f09c9c34..dbc1f8927669 100644 --- a/mypyc/test-data/irbuild-classes.test +++ b/mypyc/test-data/irbuild-classes.test @@ -613,7 +613,7 @@ class C: class D: @classmethod def f(cls, x: int) -> int: - # TODO: This could aso be optimized, since g is not ever overridden + # TODO: This could also be optimized, since g is not ever overridden return cls.g(x) @classmethod diff --git a/mypyc/test-data/irbuild-dict.test b/mypyc/test-data/irbuild-dict.test index 6139a02029b9..68c9ccb9f0e5 100644 --- a/mypyc/test-data/irbuild-dict.test +++ b/mypyc/test-data/irbuild-dict.test @@ -186,7 +186,7 @@ L3: r14 = CPyDict_CheckSize(d, r2) goto L1 L4: - r15 = CPy_NoErrOccured() + r15 = CPy_NoErrOccurred() L5: return d @@ -295,7 +295,7 @@ L5: r13 = CPyDict_CheckSize(d1, r2) goto L1 L6: - r14 = CPy_NoErrOccured() + r14 = CPy_NoErrOccurred() L7: r15 = 0 r16 = PyDict_Size(d2) @@ -325,7 +325,7 @@ L10: r33 = CPyDict_CheckSize(d2, r17) goto L8 L11: - r34 = CPy_NoErrOccured() + r34 = CPy_NoErrOccurred() L12: return 1 def union_of_dicts(d): @@ -377,7 +377,7 @@ L3: r18 = CPyDict_CheckSize(d, r3) goto L1 L4: - r19 = CPy_NoErrOccured() + r19 = CPy_NoErrOccurred() L5: return 1 def typeddict(d): @@ -436,7 +436,7 @@ L8: r17 = CPyDict_CheckSize(d, r2) goto L1 L9: - r18 = CPy_NoErrOccured() + r18 = CPy_NoErrOccurred() L10: return 1 diff --git a/mypyc/test-data/irbuild-match.test b/mypyc/test-data/irbuild-match.test index ab5a19624ba6..ba9a0d5464ea 100644 --- a/mypyc/test-data/irbuild-match.test +++ b/mypyc/test-data/irbuild-match.test @@ -148,7 +148,7 @@ L2: L3: r10 = box(None, 1) return r10 -[case testMatchExaustivePattern_python3_10] +[case testMatchExhaustivePattern_python3_10] def f(): match 123: case _: diff --git a/mypyc/test-data/irbuild-set.test b/mypyc/test-data/irbuild-set.test index 42429cf7072e..c1a00ce67504 100644 --- a/mypyc/test-data/irbuild-set.test +++ b/mypyc/test-data/irbuild-set.test @@ -157,7 +157,7 @@ L2: L3: goto L1 L4: - r10 = CPy_NoErrOccured() + r10 = CPy_NoErrOccurred() L5: b = r1 return 1 @@ -211,7 +211,7 @@ L3: r21 = CPyDict_CheckSize(tmp_dict, r10) goto L1 L4: - r22 = CPy_NoErrOccured() + r22 = CPy_NoErrOccurred() L5: c = r7 return 1 @@ -393,7 +393,7 @@ L8: L9: goto L7 L10: - r30 = CPy_NoErrOccured() + r30 = CPy_NoErrOccurred() L11: r31 = PyObject_GetIter(r8) r32 = PyObject_GetIter(r31) @@ -410,7 +410,7 @@ L13: L14: goto L12 L15: - r39 = CPy_NoErrOccured() + r39 = CPy_NoErrOccurred() L16: a = r7 return 1 @@ -752,7 +752,7 @@ L2: L3: goto L1 L4: - r4 = CPy_NoErrOccured() + r4 = CPy_NoErrOccurred() L5: return 1 def precomputed2(): @@ -770,7 +770,7 @@ L2: L3: goto L1 L4: - r3 = CPy_NoErrOccured() + r3 = CPy_NoErrOccurred() L5: return 1 def not_precomputed(): @@ -804,6 +804,6 @@ L2: L3: goto L1 L4: - r11 = CPy_NoErrOccured() + r11 = CPy_NoErrOccurred() L5: return 1 diff --git a/mypyc/test-data/irbuild-statements.test b/mypyc/test-data/irbuild-statements.test index cc9d98be51c9..c85dcb09e80a 100644 --- a/mypyc/test-data/irbuild-statements.test +++ b/mypyc/test-data/irbuild-statements.test @@ -301,7 +301,7 @@ L3: r12 = CPyDict_CheckSize(d, r2) goto L1 L4: - r13 = CPy_NoErrOccured() + r13 = CPy_NoErrOccurred() L5: return 1 @@ -368,7 +368,7 @@ L5: r18 = CPyDict_CheckSize(d, r2) goto L1 L6: - r19 = CPy_NoErrOccured() + r19 = CPy_NoErrOccurred() L7: return s @@ -917,7 +917,7 @@ L3: r0 = r4 goto L1 L4: - r5 = CPy_NoErrOccured() + r5 = CPy_NoErrOccurred() L5: return 1 @@ -978,7 +978,7 @@ L6: r0 = r12 goto L1 L7: - r13 = CPy_NoErrOccured() + r13 = CPy_NoErrOccurred() L8: return 1 def g(a, b): @@ -1027,7 +1027,7 @@ L5: z = r12 goto L1 L6: - r13 = CPy_NoErrOccured() + r13 = CPy_NoErrOccurred() L7: return 1 diff --git a/mypyc/test-data/refcount.test b/mypyc/test-data/refcount.test index e719ecb2afe1..c84ddfd73ba2 100644 --- a/mypyc/test-data/refcount.test +++ b/mypyc/test-data/refcount.test @@ -771,7 +771,7 @@ L3: r12 = CPyDict_CheckSize(d, r2) goto L1 L4: - r13 = CPy_NoErrOccured() + r13 = CPy_NoErrOccurred() L5: return 1 L6: diff --git a/mypyc/test-data/run-bools.test b/mypyc/test-data/run-bools.test index d7a2aa37ade7..a0b8ea31ebc0 100644 --- a/mypyc/test-data/run-bools.test +++ b/mypyc/test-data/run-bools.test @@ -31,7 +31,7 @@ def test_if() -> None: assert f(False) is True def test_bitwise_and() -> None: - # Use eval() to avoid constand folding + # Use eval() to avoid constant folding t: bool = eval('True') f: bool = eval('False') assert t & t == True @@ -44,7 +44,7 @@ def test_bitwise_and() -> None: assert t == False def test_bitwise_or() -> None: - # Use eval() to avoid constand folding + # Use eval() to avoid constant folding t: bool = eval('True') f: bool = eval('False') assert t | t == True @@ -57,7 +57,7 @@ def test_bitwise_or() -> None: assert f == True def test_bitwise_xor() -> None: - # Use eval() to avoid constand folding + # Use eval() to avoid constant folding t: bool = eval('True') f: bool = eval('False') assert t ^ t == False diff --git a/mypyc/test-data/run-dunders-special.test b/mypyc/test-data/run-dunders-special.test index cd02cca65eef..30c618374f88 100644 --- a/mypyc/test-data/run-dunders-special.test +++ b/mypyc/test-data/run-dunders-special.test @@ -1,7 +1,7 @@ [case testDundersNotImplemented] # This case is special because it tests the behavior of NotImplemented # used in a typed function which return type is bool. -# This is a convention that can be overriden by the user. +# This is a convention that can be overridden by the user. class UsesNotImplemented: def __eq__(self, b: object) -> bool: return NotImplemented diff --git a/mypyc/test-data/run-functions.test b/mypyc/test-data/run-functions.test index cf519f30dad8..ac4894bad304 100644 --- a/mypyc/test-data/run-functions.test +++ b/mypyc/test-data/run-functions.test @@ -140,7 +140,7 @@ def triple(a: int) -> Callable[[], Callable[[int], int]]: return outer def if_else(flag: int) -> str: - def dummy_funtion() -> str: + def dummy_function() -> str: return 'if_else.dummy_function' if flag < 0: @@ -155,7 +155,7 @@ def if_else(flag: int) -> str: return inner() def for_loop() -> int: - def dummy_funtion() -> str: + def dummy_function() -> str: return 'for_loop.dummy_function' for i in range(5): @@ -166,7 +166,7 @@ def for_loop() -> int: return 0 def while_loop() -> int: - def dummy_funtion() -> str: + def dummy_function() -> str: return 'while_loop.dummy_function' i = 0 diff --git a/test-data/unit/check-annotated.test b/test-data/unit/check-annotated.test index d4309b8ad213..47fe33bfb42a 100644 --- a/test-data/unit/check-annotated.test +++ b/test-data/unit/check-annotated.test @@ -139,7 +139,7 @@ reveal_type(f2) # N: Revealed type is "def (a: builtins.str) -> Any" def f3(a: Annotated["notdefined", "metadata"]): # E: Name "notdefined" is not defined pass T = TypeVar('T') -def f4(a: Annotated[T, "metatdata"]): +def f4(a: Annotated[T, "metadata"]): pass reveal_type(f4) # N: Revealed type is "def [T] (a: T`-1) -> Any" [builtins fixtures/tuple.pyi] diff --git a/test-data/unit/check-classes.test b/test-data/unit/check-classes.test index a3d35da15107..5ccb9fa06c34 100644 --- a/test-data/unit/check-classes.test +++ b/test-data/unit/check-classes.test @@ -2219,7 +2219,7 @@ reveal_type(B() + A()) # N: Revealed type is "__main__.A" reveal_type(A() + B()) # N: Revealed type is "__main__.A" [builtins fixtures/isinstance.pyi] -[case testBinaryOpeartorMethodPositionalArgumentsOnly] +[case testBinaryOperatorMethodPositionalArgumentsOnly] class A: def __add__(self, other: int) -> int: pass def __iadd__(self, other: int) -> int: pass diff --git a/test-data/unit/check-classvar.test b/test-data/unit/check-classvar.test index 1e87e441dea2..918926627bfd 100644 --- a/test-data/unit/check-classvar.test +++ b/test-data/unit/check-classvar.test @@ -200,7 +200,7 @@ f().x = 0 [out] main:6: error: Cannot assign to class variable "x" via instance -[case testOverrideWithIncomatibleType] +[case testOverrideWithIncompatibleType] from typing import ClassVar class A: x = None # type: ClassVar[int] diff --git a/test-data/unit/check-dataclass-transform.test b/test-data/unit/check-dataclass-transform.test index 51b2e186214f..8213f8df282a 100644 --- a/test-data/unit/check-dataclass-transform.test +++ b/test-data/unit/check-dataclass-transform.test @@ -118,7 +118,7 @@ from typing import dataclass_transform, Type BOOLEAN_CONSTANT = True -@dataclass_transform(nonexistant=True) # E: Unrecognized dataclass_transform parameter "nonexistant" +@dataclass_transform(nonexistent=True) # E: Unrecognized dataclass_transform parameter "nonexistent" def foo(cls: Type) -> Type: return cls diff --git a/test-data/unit/check-enum.test b/test-data/unit/check-enum.test index e6e42d805052..b67bb566224e 100644 --- a/test-data/unit/check-enum.test +++ b/test-data/unit/check-enum.test @@ -154,7 +154,7 @@ def infer_truth(truth: Truth) -> None: reveal_type(truth.value) # N: Revealed type is "builtins.str" [builtins fixtures/primitives.pyi] -[case testEnumValueInhomogenous] +[case testEnumValueInhomogeneous] from enum import Enum class Truth(Enum): true = 'True' @@ -2163,7 +2163,7 @@ class Mixed(Enum): reveal_type(Mixed.b.value) # N: Revealed type is "None" # Inferring Any here instead of a union seems to be a deliberate - # choice; see the testEnumValueInhomogenous case above. + # choice; see the testEnumValueInhomogeneous case above. reveal_type(self.value) # N: Revealed type is "Any" for field in Mixed: diff --git a/test-data/unit/check-functions.test b/test-data/unit/check-functions.test index b8a02a1ec7d4..e4b8c31e8b46 100644 --- a/test-data/unit/check-functions.test +++ b/test-data/unit/check-functions.test @@ -1781,7 +1781,7 @@ def a(f: F): f("foo") # E: Argument 1 has incompatible type "str"; expected "int" [builtins fixtures/dict.pyi] -[case testCallableParsingInInheritence] +[case testCallableParsingInInheritance] from collections import namedtuple class C(namedtuple('t', 'x')): @@ -2349,7 +2349,7 @@ a.__eq__(other=a) # E: Unexpected keyword argument "other" for "__eq__" of "A" [builtins fixtures/bool.pyi] --- Type variable shenanagins +-- Type variable shenanigans -- ------------------------- [case testGenericFunctionTypeDecl] diff --git a/test-data/unit/check-generics.test b/test-data/unit/check-generics.test index 5791b9c471d5..74003f824e5d 100644 --- a/test-data/unit/check-generics.test +++ b/test-data/unit/check-generics.test @@ -713,7 +713,7 @@ reveal_type(z) # N: Revealed type is "__main__.Node[Any, Any]" [out] -[case testGenericTypeAliasesAcessingMethods] +[case testGenericTypeAliasesAccessingMethods] from typing import TypeVar, Generic, List T = TypeVar('T') class Node(Generic[T]): diff --git a/test-data/unit/check-inference.test b/test-data/unit/check-inference.test index 5a99e65c9c90..bec3a9a07593 100644 --- a/test-data/unit/check-inference.test +++ b/test-data/unit/check-inference.test @@ -1669,7 +1669,7 @@ class A: self.a.append('') # E: Argument 1 to "append" of "list" has incompatible type "str"; expected "int" [builtins fixtures/list.pyi] -[case testInferListInitializedToEmptyInClassBodyAndOverriden] +[case testInferListInitializedToEmptyInClassBodyAndOverridden] from typing import List class A: diff --git a/test-data/unit/check-literal.test b/test-data/unit/check-literal.test index cff6e07670a7..296956334d20 100644 --- a/test-data/unit/check-literal.test +++ b/test-data/unit/check-literal.test @@ -2138,7 +2138,7 @@ force4(reveal_type(f.instancevar4)) # N: Revealed type is "None" [builtins fixtures/primitives.pyi] [out] -[case testLiteralFinalDirectInstanceTypesSupercedeInferredLiteral] +[case testLiteralFinalDirectInstanceTypesSupersedeInferredLiteral] from typing_extensions import Final, Literal var1: Final[int] = 1 diff --git a/test-data/unit/check-modules.test b/test-data/unit/check-modules.test index 68897790e4bf..bee0984c0c03 100644 --- a/test-data/unit/check-modules.test +++ b/test-data/unit/check-modules.test @@ -2927,7 +2927,7 @@ reveal_type(abc.__name__) # N: Revealed type is "builtins.str" reveal_type(builtins.__name__) # N: Revealed type is "builtins.str" reveal_type(typing.__name__) # N: Revealed type is "builtins.str" -[case testSpecialAttrsAreAvaliableInClasses] +[case testSpecialAttrsAreAvailableInClasses] class Some: name = __name__ reveal_type(Some.name) # N: Revealed type is "builtins.str" diff --git a/test-data/unit/check-parameter-specification.test b/test-data/unit/check-parameter-specification.test index 7f038b811741..fca72f3bebc3 100644 --- a/test-data/unit/check-parameter-specification.test +++ b/test-data/unit/check-parameter-specification.test @@ -1193,7 +1193,7 @@ def func(callback: Callable[P, str]) -> Callable[P, str]: return inner [builtins fixtures/paramspec.pyi] -[case testParamSpecArgsAndKwargsMissmatch] +[case testParamSpecArgsAndKwargsMismatch] from typing import Callable from typing_extensions import ParamSpec diff --git a/test-data/unit/check-protocols.test b/test-data/unit/check-protocols.test index dd19eb1f21d6..0571c1729302 100644 --- a/test-data/unit/check-protocols.test +++ b/test-data/unit/check-protocols.test @@ -667,7 +667,7 @@ def fun4(x: U, y: P[U, U]) -> U: pass reveal_type(fun4('a', C())) # N: Revealed type is "builtins.object" -[case testUnrealtedGenericProtolsEquivalent] +[case testUnrealtedGenericProtocolsEquivalent] from typing import TypeVar, Protocol T = TypeVar('T') @@ -4185,7 +4185,7 @@ class WriteToMeOrReadFromMe(WriteToMe[AnyStr], SupportsRead[AnyStr]): ... copyfileobj(WriteToMeOrReadFromMe[bytes](), WriteToMe[bytes]()) -[case testOverloadedMethodWithExplictSelfTypes] +[case testOverloadedMethodWithExplicitSelfTypes] from typing import Generic, overload, Protocol, TypeVar, Union AnyStr = TypeVar("AnyStr", str, bytes) diff --git a/test-data/unit/check-python310.test b/test-data/unit/check-python310.test index 0231b47cf4a0..616846789c98 100644 --- a/test-data/unit/check-python310.test +++ b/test-data/unit/check-python310.test @@ -1915,7 +1915,7 @@ class Regular: x: str y: int __match_args__ = ("x",) -class ReveresedOrder: +class ReversedOrder: x: int y: str __match_args__ = ("y",) @@ -1933,7 +1933,7 @@ class GenericDataclass(Generic[T]): input_arg: Union[ Regular, - ReveresedOrder, + ReversedOrder, GenericRegular[str], GenericWithFinal[str], RegularSubtype, @@ -1944,7 +1944,7 @@ input_arg: Union[ match input_arg: case Regular(a): reveal_type(a) # N: Revealed type is "builtins.str" - case ReveresedOrder(a): + case ReversedOrder(a): reveal_type(a) # N: Revealed type is "builtins.str" case GenericWithFinal(a): reveal_type(a) # N: Revealed type is "builtins.str" @@ -1959,7 +1959,7 @@ match input_arg: match input_arg: case Regular(x=a): reveal_type(a) # N: Revealed type is "builtins.str" - case ReveresedOrder(x=b): # Order is different + case ReversedOrder(x=b): # Order is different reveal_type(b) # N: Revealed type is "builtins.int" case GenericWithFinal(x=a): reveal_type(a) # N: Revealed type is "builtins.str" diff --git a/test-data/unit/check-typeddict.test b/test-data/unit/check-typeddict.test index 5234ced8ea86..5515cfc61b10 100644 --- a/test-data/unit/check-typeddict.test +++ b/test-data/unit/check-typeddict.test @@ -3015,7 +3015,7 @@ class Bar(TypedDict): b: int foo: Foo = {"a": 1, "b": "a"} -bar1: Bar = {**foo, "b": 2} # Incompatible item is overriden +bar1: Bar = {**foo, "b": 2} # Incompatible item is overridden bar2: Bar = {**foo, "a": 2} # E: Incompatible types (expression has type "str", TypedDict item "b" has type "int") [builtins fixtures/dict.pyi] [typing fixtures/typing-typeddict.pyi] diff --git a/test-data/unit/cmdline.pyproject.test b/test-data/unit/cmdline.pyproject.test index 831bce2eb63d..57e6facad032 100644 --- a/test-data/unit/cmdline.pyproject.test +++ b/test-data/unit/cmdline.pyproject.test @@ -92,7 +92,7 @@ exclude = '''(?x)( [file x/__init__.py] i: int = 0 [file x/_skipme_please.py] -This isn't even syntatically valid! +This isn't even syntactically valid! [file x/please_skipme_.py] Neither is this! @@ -107,7 +107,7 @@ exclude = """(?x)( [file x/__init__.py] i: int = 0 [file x/_skipme_please.py] -This isn't even syntatically valid! +This isn't even syntactically valid! [file x/please_skipme_.py] Neither is this! @@ -122,7 +122,7 @@ exclude = [ [file x/__init__.py] i: int = 0 [file x/_skipme_please.py] -This isn't even syntatically valid! +This isn't even syntactically valid! [file x/please_skipme_.py] Neither is this! diff --git a/test-data/unit/deps.test b/test-data/unit/deps.test index 84cea99bf2f6..757bd9541fc9 100644 --- a/test-data/unit/deps.test +++ b/test-data/unit/deps.test @@ -749,7 +749,7 @@ class C: -> m.outer -> m, m.outer -[case testDecoratorDepsDeeepNested] +[case testDecoratorDepsDeepNested] import mod def outer() -> None: diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test index 9ff8a37ae9ae..19564133e375 100644 --- a/test-data/unit/fine-grained.test +++ b/test-data/unit/fine-grained.test @@ -2369,7 +2369,7 @@ a.py:7: error: "B" has no attribute "x" == a.py:5: error: Missing positional argument "x" in call to "C" -[case testDecoratorUpdateDeeepNested] +[case testDecoratorUpdateDeepNested] import a [file a.py] import mod @@ -6966,7 +6966,7 @@ class A: == main:3: error: "A" has no attribute "__iter__" (not iterable) -[case testWeAreCarefullWithBuiltinProtocolsBase] +[case testWeAreCarefulWithBuiltinProtocolsBase] import a x: a.A for i in x: @@ -7119,7 +7119,7 @@ class AS: == main:9: error: Incompatible types in assignment (expression has type "int", variable has type "str") -[case testOverloadsUpdatedTypeRechekConsistency] +[case testOverloadsUpdatedTypeRecheckConsistency] from typing import overload import mod class Outer: diff --git a/test-data/unit/semanal-basic.test b/test-data/unit/semanal-basic.test index 169769f06a00..1f03ed22648d 100644 --- a/test-data/unit/semanal-basic.test +++ b/test-data/unit/semanal-basic.test @@ -316,7 +316,7 @@ MypyFile:1( NameExpr(x* [l]) NameExpr(None [builtins.None]))))) -[case testGlobaWithinMethod] +[case testGlobalWithinMethod] x = None class A: def f(self): diff --git a/test-data/unit/semanal-errors.test b/test-data/unit/semanal-errors.test index 2f0a4c140915..5e7da27f17cb 100644 --- a/test-data/unit/semanal-errors.test +++ b/test-data/unit/semanal-errors.test @@ -1475,7 +1475,7 @@ from typing_extensions import Unpack from typing import Tuple heterogenous_tuple: Tuple[Unpack[Tuple[int, str]]] -homogenous_tuple: Tuple[Unpack[Tuple[int, ...]]] +homogeneous_tuple: Tuple[Unpack[Tuple[int, ...]]] bad: Tuple[Unpack[int]] # E: "int" cannot be unpacked (must be tuple or TypeVarTuple) [builtins fixtures/tuple.pyi]