Detect typing module attributes with 'import typing as <name>

Signed-off-by: weiyaping <weiyaping@xfusion.com>
This commit is contained in:
weiyaping 2023-12-18 17:44:14 +08:00
parent 516636b44e
commit b5dd1e53d9
2 changed files with 80 additions and 1 deletions

View File

@ -0,0 +1,75 @@
From 13cad915e6b181b2f6a85efc2ead4856b23bccc0 Mon Sep 17 00:00:00 2001
From: Angus L'Herrou <piraka@brandeis.edu>
Date: Tue, 5 Oct 2021 18:44:29 -0400
Subject: [PATCH] Detect typing module attributes with 'import typing as
<name>' (#632)
* added functionality to detect typing module attributes with 'import typing as <name>'
* remove async keyword from test_aliased_import
---
pyflakes/checker.py | 12 +++++++++++-
pyflakes/test/test_type_annotations.py | 17 +++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/pyflakes/checker.py b/pyflakes/checker.py
index 6fafe89..45c7a4a 100644
--- a/pyflakes/checker.py
+++ b/pyflakes/checker.py
@@ -720,6 +720,16 @@ def _is_typing_helper(node, is_name_match_fn, scope_stack):
return False
+ def _module_scope_is_typing(name):
+ for scope in reversed(scope_stack):
+ if name in scope:
+ return (
+ isinstance(scope[name], Importation) and
+ scope[name].fullName in TYPING_MODULES
+ )
+
+ return False
+
return (
(
isinstance(node, ast.Name) and
@@ -727,7 +737,7 @@ def _is_typing_helper(node, is_name_match_fn, scope_stack):
) or (
isinstance(node, ast.Attribute) and
isinstance(node.value, ast.Name) and
- node.value.id in TYPING_MODULES and
+ _module_scope_is_typing(node.value.id) and
is_name_match_fn(node.attr)
)
)
diff --git a/pyflakes/test/test_type_annotations.py b/pyflakes/test/test_type_annotations.py
index 6a66bcd..f3b6c24 100644
--- a/pyflakes/test/test_type_annotations.py
+++ b/pyflakes/test/test_type_annotations.py
@@ -121,6 +121,23 @@ class TestTypeAnnotations(TestCase):
def f(self, x): return x
""")
+ def test_aliased_import(self):
+ """Detect when typing is imported as another name"""
+ self.flakes("""
+ import typing as t
+
+ @t.overload
+ def f(s): # type: (None) -> None
+ pass
+
+ @t.overload
+ def f(s): # type: (int) -> int
+ pass
+
+ def f(s):
+ return s
+ """)
+
def test_not_a_typing_overload(self):
"""regression test for @typing.overload detection bug in 2.1.0"""
self.flakes("""
--
2.42.0.windows.2

View File

@ -1,6 +1,6 @@
Name: pyflakes
Version: 2.3.1
Release: 3
Release: 4
Summary: A simple program which checks Python source files for errors
License: MIT
URL: https://github.com/PyCQA/pyflakes
@ -10,6 +10,7 @@ BuildRequires: python2-devel >= 2.7 python2-setuptools
Patch0001: 0001-remove-old-and-unused-tracing-code-625.patch
Patch0002: 0001-add-support-for-match-statement-630.patch
Patch0003: 0001-Detect-typing-module-attributes-with-import-typing-a.patch
%description
This is a safe program which analyze programs and detects various errors.\
@ -93,6 +94,9 @@ ln -s pyflakes-3.1 %{buildroot}%{_mandir}/man1/pyflakes.1
%changelog
* Mon Dec 18 2023 liubo <liubo1@xfusion.com> - 2.3.1-4
- Detect typing module attributes with 'import typing as <name>
* Thu Nov 23 2023 liubo <liubo1@xfusion.com> - 2.3.1-3
- add support for match statement