Minor refactoring

python · JukkaL · Sep 27, 2019 · Sep 3, 2019 · Sep 3, 2019 · Sep 3, 2019
commit 4c7c8bb9645fe11e0dd078efec85ab542de5e2f4
diff --git a/mypy/fastparse.py b/mypy/fastparse.py
@@ -124,6 +124,8 @@ def ast3_parse(source: Union[str, bytes], filename: str, mode: str,
 
 TYPE_COMMENT_SYNTAX_ERROR = 'syntax error in type comment'  # type: Final
 
+INVALID_TYPE_IGNORE = 'Invalid "type: ignore" comment'  # type: Final
+
 TYPE_IGNORE_PATTERN = re.compile(r'[^#]*#\s*type:\s*ignore\s*\b(.*)')
 
 
@@ -215,8 +217,7 @@ def parse_type_comment(type_comment: str,
                 ignored = []  # Ignore everything
             if ignored is None:
                 if errors is not None:
-                    errors.report(line, column, 'Invalid "type: ignore" comment',
-                                  code=codes.SYNTAX)
+                    errors.report(line, column, INVALID_TYPE_IGNORE, code=codes.SYNTAX)
                 else:
                     raise SyntaxError
         else:
@@ -470,7 +471,7 @@ def visit_Module(self, mod: ast3.Module) -> MypyFile:
             if parsed is not None:
                 self.type_ignores[ti.lineno] = parsed
             else:
-                self.fail('Invalid "type: ignore" comment', ti.lineno, -1)
+                self.fail(INVALID_TYPE_IGNORE, ti.lineno, -1)
         body = self.fix_function_overloads(self.translate_stmt_list(mod.body, ismodule=True))
         return MypyFile(body,
                         self.imports,

diff --git a/mypy/fastparse2.py b/mypy/fastparse2.py
@@ -47,7 +47,7 @@
 from mypy.errors import Errors
 from mypy.fastparse import (
     TypeConverter, parse_type_comment, bytes_to_human_readable_repr, parse_type_ignore_tag,
-    TYPE_IGNORE_PATTERN
+    TYPE_IGNORE_PATTERN, INVALID_TYPE_IGNORE
 )
 from mypy.options import Options
 from mypy.reachability import mark_block_unreachable
@@ -348,7 +348,7 @@ def visit_Module(self, mod: ast27.Module) -> MypyFile:
             if parsed is not None:
                 self.type_ignores[ti.lineno] = parsed
             else:
-                self.fail('Invalid "type: ignore" comment', ti.lineno, -1)
+                self.fail(INVALID_TYPE_IGNORE, ti.lineno, -1)
         body = self.fix_function_overloads(self.translate_stmt_list(mod.body))
         return MypyFile(body,
                         self.imports,
@@ -563,7 +563,7 @@ def get_type(self,
                     else:
                         ignored = []
                     if ignored is None:
-                        self.fail('Invalid "type: ignore" comment', converter.line, -1)
+                        self.fail(INVALID_TYPE_IGNORE, converter.line, -1)
                     else:
                         self.type_ignores[converter.line] = ignored
                 return typ