Louis-Philippe Véronneau pushed to branch master at lintian / lintian
Commits:
1147410d by Maytham Alsudany at 2025-03-19T22:20:11+00:00
Account for indented imports in Python stdlib-deprecation check
Closes: #1084833
- - - - -
3 changed files:
- lib/Lintian/Check/Languages/Python/StdlibDeprecation.pm
-
t/recipes/checks/languages/python/stdlib-deprecation/python-imports-distutils/build-spec/orig/import.py
-
t/recipes/checks/languages/python/stdlib-deprecation/python-imports-distutils/eval/hints
Changes:
=====================================
lib/Lintian/Check/Languages/Python/StdlibDeprecation.pm
=====================================
@@ -104,7 +104,7 @@ sub visit_patched_files {
# does not match "from library2"
# does not match "from notlibrary"
# does not match "from library2.library"
- if $line =~ m{^from $library(\s+|\..+)import}
+ if $line =~ m{^\s*from $library(\s+|\..+)import}
# import foo, library, bar
# import library
# import library as l
@@ -117,7 +117,7 @@ sub visit_patched_files {
# does not match "import notlibrary"
# does not match "import library2.library"
# does not match "import library2 as library"
- ||$line =~ m{^import(\s+|.+,\s?)$library([,.\s]|$)};
+ ||$line =~ m{^\s*import(\s+|.+,\s?)$library([,.\s]|$)};
}
}continue {
=====================================
t/recipes/checks/languages/python/stdlib-deprecation/python-imports-distutils/build-spec/orig/import.py
=====================================
@@ -4,6 +4,9 @@ import distutils
import foo, bar, distutils.core
import foo, distutils.core, bara
+if "this" != "that":
+ import distutils
+
# This should not match the uses-deprecated-python-stdlib tag
import distutils2
import notdistutils
=====================================
t/recipes/checks/languages/python/stdlib-deprecation/python-imports-distutils/eval/hints
=====================================
@@ -1,3 +1,4 @@
+python-imports-distutils (source): uses-deprecated-python-stdlib distutils
(deprecated in Python 3.10, removed in Python 3.12) [import.py:8]
python-imports-distutils (source): uses-deprecated-python-stdlib distutils
(deprecated in Python 3.10, removed in Python 3.12) [import.py:5]
python-imports-distutils (source): uses-deprecated-python-stdlib distutils
(deprecated in Python 3.10, removed in Python 3.12) [import.py:4]
python-imports-distutils (source): uses-deprecated-python-stdlib distutils
(deprecated in Python 3.10, removed in Python 3.12) [import.py:3]
View it on GitLab:
https://salsa.debian.org/lintian/lintian/-/commit/1147410ded3dfe00dfa430fab8d8b9ddb8c8c950
--
View it on GitLab:
https://salsa.debian.org/lintian/lintian/-/commit/1147410ded3dfe00dfa430fab8d8b9ddb8c8c950
You're receiving this email because of your account on salsa.debian.org.
