Sort mypy.options.PER_MODULE_OPTIONS and fix typo (#9469)

e-kwsm · web-flow · commit eb50379defc1 · 2020-09-22T15:56:22.000-07:00
diff --git a/docs/source/error_code_list.rst b/docs/source/error_code_list.rst
@@ -25,7 +25,7 @@ Example:
        def __init__(self, name: str) -> None:
            self.name = name
 
-   r = Resouce('x')
+   r = Resource('x')
    print(r.name)  # OK
    print(r.id)  # Error: "Resource" has no attribute "id"  [attr-defined]
    r.id = 5  # Error: "Resource" has no attribute "id"  [attr-defined]
diff --git a/docs/source/literal_types.rst b/docs/source/literal_types.rst
@@ -256,7 +256,7 @@ type. Then, you can discriminate between each kind of TypedDict by checking the
             print(event["job_id"])
 
 While this feature is mostly useful when working with TypedDicts, you can also
-use the same technique wih regular objects, tuples, or namedtuples.
+use the same technique with regular objects, tuples, or namedtuples.
 
 Similarly, tags do not need to be specifically str Literals: they can be any type
 you can normally narrow within ``if`` statements and the like. For example, you
diff --git a/mypy/checker.py b/mypy/checker.py
@@ -5460,7 +5460,7 @@ def visit_uninhabited_type(self, t: UninhabitedType) -> Type:
         return t
 
     def visit_type_alias_type(self, t: TypeAliasType) -> Type:
-        # Target of the alias cannot by an ambigous <nothing>, so we just
+        # Target of the alias cannot by an ambiguous <nothing>, so we just
         # replace the arguments.
         return t.copy_modified(args=[a.accept(self) for a in t.args])
 
diff --git a/mypy/options.py b/mypy/options.py
@@ -21,9 +21,8 @@ class BuildType:
 
 PER_MODULE_OPTIONS = {
     # Please keep this list sorted
-    "allow_untyped_globals",
     "allow_redefinition",
-    "strict_equality",
+    "allow_untyped_globals",
     "always_false",
     "always_true",
     "check_untyped_defs",
@@ -42,11 +41,12 @@ class BuildType:
     "follow_imports_for_stubs",
     "ignore_errors",
     "ignore_missing_imports",
+    "implicit_reexport",
     "local_partial_types",
     "mypyc",
     "no_implicit_optional",
-    "implicit_reexport",
     "show_none_errors",
+    "strict_equality",
     "strict_optional",
     "strict_optional_whitelist",
     "warn_no_return",
diff --git a/mypy/renaming.py b/mypy/renaming.py
@@ -249,7 +249,7 @@ def flush_refs(self) -> None:
         is_func = self.scope_kinds[-1] == FUNCTION
         for name, refs in self.refs[-1].items():
             if len(refs) == 1:
-                # Only one definition -- no renaming neeed.
+                # Only one definition -- no renaming needed.
                 continue
             if is_func:
                 # In a function, don't rename the first definition, as it
diff --git a/mypy/test/testinfer.py b/mypy/test/testinfer.py
@@ -452,7 +452,7 @@ def test_single_pair(self) -> None:
 
     def test_empty_pair_list(self) -> None:
         # This case should never occur in practice -- ComparisionExprs
-        # always contain at least one comparision. But in case it does...
+        # always contain at least one comparison. But in case it does...
 
         self.assertEqual(group_comparison_operands([], {}, set()), [])
         self.assertEqual(group_comparison_operands([], {}, {'=='}), [])
diff --git a/mypyc/doc/introduction.rst b/mypyc/doc/introduction.rst
@@ -116,7 +116,7 @@ arbitary third-party libraries, including C extensions.
 often requires only minor changes to compile using mypyc.
 
 **No need to wait for compilation.** Compiled code also runs as normal
-Python code. You can use intepreted Python during development, with
+Python code. You can use interpreted Python during development, with
 familiar workflows.
 
 **Runtime type safety.** Mypyc aims to protect you from segfaults and
diff --git a/mypyc/ir/ops.py b/mypyc/ir/ops.py
@@ -567,7 +567,7 @@ def accept(self, visitor: 'OpVisitor[T]') -> T:
 
 
 class DecRef(RegisterOp):
-    """Decrease referece count and free object if zero (dec_ref r).
+    """Decrease reference count and free object if zero (dec_ref r).
 
     The is_xdec flag says to use an XDECREF, which checks if the
     pointer is NULL first.
diff --git a/mypyc/ir/rtypes.py b/mypyc/ir/rtypes.py
@@ -132,7 +132,7 @@ class RVoid(RType):
     """The void type (no value).
 
     This is a singleton -- use void_rtype (below) to refer to this instead of
-    constructing a new instace.
+    constructing a new instance.
     """
 
     is_unboxed = False
@@ -515,7 +515,7 @@ def compute_aligned_offsets_and_size(types: List[RType]) -> Tuple[List[int], int
             current_offset += cur_size
             next_alignment = alignments[i + 1]
             # compute aligned offset,
-            # check https://en.wikipedia.org/wiki/Data_structure_alignment for more infomation
+            # check https://en.wikipedia.org/wiki/Data_structure_alignment for more information
             current_offset = (current_offset + (next_alignment - 1)) & -next_alignment
         else:
             struct_alignment = max(alignments)
diff --git a/mypyc/test-data/run-classes.test b/mypyc/test-data/run-classes.test
@@ -1059,7 +1059,7 @@ class B(A):
         return 10
 
 # This is just to make sure that this stuff works even when the
-# methods might be overriden.
+# methods might be overridden.
 class C(B):
     @classmethod
     def foo(cls, *, y: int = 0, x: int = 0) -> None:
diff --git a/setup.py b/setup.py
@@ -147,7 +147,7 @@ def run(self):
     ext_modules = mypycify(
         mypyc_targets + ['--config-file=mypy_bootstrap.ini'],
         opt_level=opt_level,
-        # Use multi-file compliation mode on windows because without it
+        # Use multi-file compilation mode on windows because without it
         # our Appveyor builds run out of memory sometimes.
         multi_file=sys.platform == 'win32' or force_multifile,
     )
diff --git a/test-data/stdlib-samples/3.2/random.py b/test-data/stdlib-samples/3.2/random.py
@@ -238,7 +238,7 @@ def _randbelow(self, n: int, int: Callable[[float], int] = int,
             while r >= n:
                 r = getrandbits(k)
             return r
-        # There's an overriden random() method but no new getrandbits() method,
+        # There's an overridden random() method but no new getrandbits() method,
         # so we can only use random() from here.
         random = self.random
         if n >= maxsize:
diff --git a/test-data/stdlib-samples/3.2/tempfile.py b/test-data/stdlib-samples/3.2/tempfile.py
@@ -646,7 +646,7 @@ class TemporaryDirectory(object):
         with TemporaryDirectory() as tmpdir:
             ...
 
-    Upon exiting the context, the directory and everthing contained
+    Upon exiting the context, the directory and everything contained
     in it are removed.
     """
 
diff --git a/test-data/stdlib-samples/3.2/test/test_set.py b/test-data/stdlib-samples/3.2/test/test_set.py
@@ -1799,7 +1799,7 @@ def test_cuboctahedron(self):
 
         # http://en.wikipedia.org/wiki/Cuboctahedron
         # 8 triangular faces and 6 square faces
-        # 12 indentical vertices each connecting a triangle and square
+        # 12 identical vertices each connecting a triangle and square
 
         g = cube(3)
         cuboctahedron = linegraph(g)            # V( --> {V1, V2, V3, V4}
diff --git a/test-data/unit/check-newsemanal.test b/test-data/unit/check-newsemanal.test
@@ -1092,7 +1092,7 @@ import a
 [file a.py]
 C = 1
 MYPY = False
-if MYPY:  # Tweak processing ordre
+if MYPY:  # Tweak processing order
     from b import *  # E: Incompatible import of "C" (imported name has type "Type[C]", local name has type "int")
 
 [file b.py]
diff --git a/test-data/unit/deps-classes.test b/test-data/unit/deps-classes.test
@@ -183,7 +183,7 @@ class B: pass
 <m.A> -> <m.f>, m.A, m.f, m.g
 <m.B.__init__> -> m
 <m.B.__new__> -> m
--- The <m.A.X> dependecy target is superfluous but benign
+-- The <m.A.X> dependency target is superfluous but benign
 <m.B> -> <m.A.X>, m
 <m> -> m
 
diff --git a/test-data/unit/fine-grained-follow-imports.test b/test-data/unit/fine-grained-follow-imports.test
@@ -712,7 +712,7 @@ m.f(1)
 [file p/__init__.py]
 
 [file p/m.py.2]
-# This change will trigger a cached file (main.py) through a supressed
+# This change will trigger a cached file (main.py) through a suppressed
 # submodule, resulting in additional errors in main.py.
 def f() -> None: pass
 
diff --git a/test-data/unit/fixtures/object_with_init_subclass.pyi b/test-data/unit/fixtures/object_with_init_subclass.pyi
@@ -7,7 +7,7 @@ class object:
 T = TypeVar('T')
 KT = TypeVar('KT')
 VT = TypeVar('VT')
-# copy pased from primitives.pyi
+# copy pasted from primitives.pyi
 class type:
     def __init__(self, x) -> None: pass
 
