8000 Add plugin to infer more precise regex match types by Michael0x2a · Pull Request #7803 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Add plugin to infer more precise regex match types #7803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add plugin to infer more precise regex match types #7803

Changes from 1 commit
Commits
Show all changes
8 commits
8000
Select commit Hold shift + click to select a range
54dfad8
Add plugin to infer more precise regex match types
Michael0x2a Aug 24, 2019
9a7097f
Fix compatibility issues with other Python versions
Michael0x2a Oct 27, 2019
03bd647
Merge branch 'master' into add-regex-plugin
97littleleaf11 Jan 5, 2022
45168cd
Fix
97littleleaf11 Jan 5, 2022
9d468df
Fix
97littleleaf11 Jan 5, 2022
ced8cda
Fix calling on a property
97littleleaf11 Jan 5, 2022
f54eff2
Fix type check
97littleleaf11 Jan 5, 2022
3b38dc9
Fix test
97littleleaf11 Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix type check
  • Loading branch information
@97littleleaf11
97littleleaf11 committed Jan 5, 2022
commit f54eff29cb842de1cc6596d5afca81bf855eca73
10 changes: 5 additions & 5 deletions mypy/plugins/regex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def extract_regex_group_info(pattern: str) -> Tuple[List[int], int, Dict[str, in

mandatory_groups = [0] + list(sorted(find_mandatory_groups(ast)))

if sys.version_info >= (3, 8, 0):
if sys.version_info >= (3, 8):
state = ast.state
else:
state = ast.pattern
Expand All @@ -162,7 +162,7 @@ def analyze_regex_pattern_call(pattern_type: Type,
these cases.
"""

pattern_type = coerce_to_literal(pattern_type)
pattern_type = get_proper_type(coerce_to_literal(pattern_type))
if not isinstance(pattern_type, LiteralType):
return default_return_type
8000 if pattern_type.fallback.type.fullname not in STR_LIKE_TYPES:
Expand Down Expand Up @@ -245,7 +245,7 @@ def re_get_match_callback(ctx: mypy.plugin.MethodContext) -> Type:
if not isinstance(self_type, Instance) or 'default_re_plugin' not in self_type.metadata:
return return_type

match_object = remove_optional(return_type)
match_object = get_proper_type(remove_optional(return_type))
assert isinstance(match_object, Instance)

pattern_metadata = self_type.metadata['default_re_plugin']
Expand Down Expand Up @@ -301,7 +301,7 @@ def re_match_group_callback(ctx: mypy.plugin.MethodContext) -> Type:
possible_indices = []
for arg_type in ctx.arg_types:
if len(arg_type) >= 1:
possible_indices.append(coerce_to_literal(arg_type[0]))
possible_indices.append(get_proper_type(coerce_to_literal(arg_type[0])))

outputs: List[Type] = []
for possible_index in possible_indices:
Expand All @@ -310,7 +310,7 @@ def re_match_group_callback(ctx: mypy.plugin.MethodContext) -> Type:
continue

value = possible_index.value
fallback_name = possible_index.fallback.type.fullname()
fallback_name = possible_index.fallback.type.fullname

if isinstance(value, str) and fallback_name in STR_LIKE_TYPES:
if value not in named_groups:
Expand Down
0