Fix unnecessarily split quotes, couple string bugs (#13603)

hauntsaninja · web-flow · commit 130e1a4e6fc5 · 2022-09-03T22:42:52.000-07:00
This is a relic from blackening. Actually quite a few buggy strings in
here, so glad I did this.
diff --git a/misc/incremental_checker.py b/misc/incremental_checker.py
@@ -407,7 +407,7 @@ def main() -> None:
     parser.add_argument(
         "range_start",
         metavar="COMMIT_ID_OR_NUMBER",
-        help="the commit id to start from, or the number of " "commits to move back (see above)",
+        help="the commit id to start from, or the number of commits to move back (see above)",
     )
     parser.add_argument(
         "-r",
@@ -439,7 +439,7 @@ def main() -> None:
         "--branch",
         default=None,
         metavar="NAME",
-        help="check out and test a custom branch" "uses the default if not specified",
+        help="check out and test a custom branch uses the default if not specified",
     )
     parser.add_argument("--sample", type=int, help="use a random sample of size SAMPLE")
     parser.add_argument("--seed", type=str, help="random seed")
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -1194,7 +1194,7 @@ def check_call_expr_with_callee_type(
         return ret_type
 
     def check_union_call_expr(self, e: CallExpr, object_type: UnionType, member: str) -> Type:
-        """ "Type check calling a member expression where the base type is a union."""
+        """Type check calling a member expression where the base type is a union."""
         res: list[Type] = []
         for typ in object_type.relevant_items():
             # Member access errors are already reported when visiting the member expression.
diff --git a/mypy/config_parser.py b/mypy/config_parser.py
@@ -484,8 +484,7 @@ def parse_section(
                     results["follow_imports"] = "skip"
         if key == "almost_silent":
             print(
-                "%salmost_silent has been replaced by " "follow_imports=error" % prefix,
-                file=stderr,
+                "%salmost_silent has been replaced by follow_imports=error" % prefix, file=stderr
             )
             if v:
                 if "follow_imports" not in results:
diff --git a/mypy/fastparse.py b/mypy/fastparse.py
@@ -934,7 +934,7 @@ def do_func_def(
         if any(arg_types) or return_type:
             if len(arg_types) != 1 and any(isinstance(t, EllipsisType) for t in arg_types):
                 self.fail(
-                    "Ellipses cannot accompany other argument types " "in function type signature",
+                    "Ellipses cannot accompany other argument types in function type signature",
                     lineno,
                     n.col_offset,
                 )
diff --git a/mypy/ipc.py b/mypy/ipc.py
@@ -252,7 +252,7 @@ def __exit__(
                 # Wait for the client to finish reading the last write before disconnecting
                 if not FlushFileBuffers(self.connection):
                     raise IPCException(
-                        "Failed to flush NamedPipe buffer," "maybe the client hung up?"
+                        "Failed to flush NamedPipe buffer, maybe the client hung up?"
                     )
             finally:
                 DisconnectNamedPipe(self.connection)
diff --git a/mypy/main.py b/mypy/main.py
@@ -657,7 +657,7 @@ def add_invertible_flag(
         "--disallow-any-generics",
         default=False,
         strict_flag=True,
-        help="Disallow usage of generic types that do not specify explicit type " "parameters",
+        help="Disallow usage of generic types that do not specify explicit type parameters",
         group=disallow_any_group,
     )
     add_invertible_flag(
diff --git a/mypy/messages.py b/mypy/messages.py
@@ -1302,7 +1302,7 @@ def incompatible_self_argument(
         )
 
     def incompatible_conditional_function_def(self, defn: FuncDef) -> None:
-        self.fail("All conditional function variants must have identical " "signatures", defn)
+        self.fail("All conditional function variants must have identical signatures", defn)
 
     def cannot_instantiate_abstract_class(
         self, class_name: str, abstract_attributes: dict[str, bool], context: Context
diff --git a/mypy/nodes.py b/mypy/nodes.py
@@ -3715,7 +3715,7 @@ def check_arg_kinds(
         if kind == ARG_POS:
             if is_var_arg or is_kw_arg or seen_named or seen_opt:
                 fail(
-                    "Required positional args may not appear " "after default, named or var args",
+                    "Required positional args may not appear after default, named or var args",
                     node,
                 )
                 break
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -1099,7 +1099,7 @@ def handle_missing_overload_decorators(
                     )
                 else:
                     self.fail(
-                        "The implementation for an overloaded function " "must come last",
+                        "The implementation for an overloaded function must come last",
                         defn.items[idx],
                     )
         else:
@@ -3347,7 +3347,7 @@ def analyze_lvalue(
         elif isinstance(lval, MemberExpr):
             self.analyze_member_lvalue(lval, explicit_type, is_final)
             if explicit_type and not self.is_self_member_ref(lval):
-                self.fail("Type cannot be declared in assignment to non-self " "attribute", lval)
+                self.fail("Type cannot be declared in assignment to non-self attribute", lval)
         elif isinstance(lval, IndexExpr):
             if explicit_type:
                 self.fail("Unexpected type declaration", lval)
diff --git a/mypy/stubgen.py b/mypy/stubgen.py
@@ -1732,9 +1732,7 @@ def parse_options(args: list[str]) -> Options:
     parser.add_argument(
         "--export-less",
         action="store_true",
-        help=(
-            "don't implicitly export all names imported from other modules " "in the same package"
-        ),
+        help="don't implicitly export all names imported from other modules in the same package",
     )
     parser.add_argument("-v", "--verbose", action="store_true", help="show more verbose messages")
     parser.add_argument("-q", "--quiet", action="store_true", help="show fewer messages")
diff --git a/mypy/stubtest.py b/mypy/stubtest.py
@@ -1729,7 +1729,7 @@ def parse_options(args: list[str]) -> _Arguments:
     parser.add_argument(
         "--mypy-config-file",
         metavar="FILE",
-        help=("Use specified mypy config file to determine mypy plugins " "and mypy path"),
+        help=("Use specified mypy config file to determine mypy plugins and mypy path"),
     )
     parser.add_argument(
         "--custom-typeshed-dir", metavar="DIR", help="Use the custom typeshed in DIR"
diff --git a/mypy/test/data.py b/mypy/test/data.py
@@ -189,7 +189,7 @@ def parse_test_case(case: DataDrivenTestCase) -> None:
         ):
             raise ValueError(
                 (
-                    "Stale modules after pass {} must be a subset of rechecked " "modules ({}:{})"
+                    "Stale modules after pass {} must be a subset of rechecked modules ({}:{})"
                 ).format(passnum, case.file, first_item.line)
             )
 
diff --git a/mypy/test/test_find_sources.py b/mypy/test/test_find_sources.py
@@ -356,7 +356,8 @@ def test_find_sources_exclude(self) -> None:
             "/kg",
             "/g.py",
             "/bc",
-            "/xxx/pkg/a2/b/f.py" "xxx/pkg/a2/b/f.py",
+            "/xxx/pkg/a2/b/f.py",
+            "xxx/pkg/a2/b/f.py",
         ]
         big_exclude2 = ["|".join(big_exclude1)]
         for big_exclude in [big_exclude1, big_exclude2]:

Original file line number	Diff line number	Diff line change
`@@ -934,7 +934,7 @@ def do_func_def(`
`934`	`934`	`if any(arg_types) or return_type:`
`935`	`935`	`if len(arg_types) != 1 and any(isinstance(t, EllipsisType) for t in arg_types):`
`936`	`936`	`self.fail(`
`937`		`- "Ellipses cannot accompany other argument types " "in function type signature",`
	`937`	`+ "Ellipses cannot accompany other argument types in function type signature",`
`938`	`938`	`lineno,`
`939`	`939`	`n.col_offset,`
`940`	`940`	`)`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ def __exit__(`
`252`	`252`	`# Wait for the client to finish reading the last write before disconnecting`
`253`	`253`	`if not FlushFileBuffers(self.connection):`
`254`	`254`	`raise IPCException(`
`255`		`- "Failed to flush NamedPipe buffer," "maybe the client hung up?"`
	`255`	`+ "Failed to flush NamedPipe buffer, maybe the client hung up?"`
`256`	`256`	`)`
`257`	`257`	`finally:`
`258`	`258`	`DisconnectNamedPipe(self.connection)`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ def add_invertible_flag(`
`657`	`657`	`"--disallow-any-generics",`
`658`	`658`	`default=False,`
`659`	`659`	`strict_flag=True,`
`660`		`- help="Disallow usage of generic types that do not specify explicit type " "parameters",`
	`660`	`+ help="Disallow usage of generic types that do not specify explicit type parameters",`
`661`	`661`	`group=disallow_any_group,`
`662`	`662`	`)`
`663`	`663`	`add_invertible_flag(`
Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,7 @@ def incompatible_self_argument(`
`1302`	`1302`	`)`
`1303`	`1303`
`1304`	`1304`	`def incompatible_conditional_function_def(self, defn: FuncDef) -> None:`
`1305`		`- self.fail("All conditional function variants must have identical " "signatures", defn)`
	`1305`	`+ self.fail("All conditional function variants must have identical signatures", defn)`
`1306`	`1306`
`1307`	`1307`	`def cannot_instantiate_abstract_class(`
`1308`	`1308`	`self, class_name: str, abstract_attributes: dict[str, bool], context: Context`
Original file line number	Diff line number	Diff line change
`@@ -3715,7 +3715,7 @@ def check_arg_kinds(`
`3715`	`3715`	`if kind == ARG_POS:`
`3716`	`3716`	`if is_var_arg or is_kw_arg or seen_named or seen_opt:`
`3717`	`3717`	`fail(`
`3718`		`- "Required positional args may not appear " "after default, named or var args",`
	`3718`	`+ "Required positional args may not appear after default, named or var args",`
`3719`	`3719`	`node,`
`3720`	`3720`	`)`
`3721`	`3721`	`break`