Skip to content

Commit 58706b5

Browse files
Fix F403 wildcart import used in astroid/__init__.py (#1271)
* Fix F403 wildcart import used in astroid/__init__.py And apply flake8 on setup.py and astroid/__init__.py Co-authored-by: Daniël van Noord <[email protected]>
1 parent 3b8db00 commit 58706b5

File tree

10 files changed

+40
-6
lines changed

10 files changed

+40
-6
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ repos:
4747
hooks:
4848
- id: flake8
4949
additional_dependencies: [flake8-bugbear, flake8-typing-imports==1.12.0]
50-
exclude: tests/testdata|doc/conf.py|astroid/__init__.py
50+
exclude: tests/testdata|doc/conf.py
5151
- repo: local
5252
hooks:
5353
- id: pylint

astroid/__init__.py

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,36 @@
6464
from astroid.brain.helpers import register_module_extender
6565
from astroid.builder import extract_node, parse
6666
from astroid.const import PY310_PLUS, Context, Del, Load, Store
67-
from astroid.exceptions import *
67+
from astroid.exceptions import (
68+
AstroidBuildingError,
69+
AstroidBuildingException,
70+
AstroidError,
71+
AstroidImportError,
72+
AstroidIndexError,
73+
AstroidSyntaxError,
74+
AstroidTypeError,
75+
AstroidValueError,
76+
AttributeInferenceError,
77+
BinaryOperationError,
78+
DuplicateBasesError,
79+
InconsistentMroError,
80+
InferenceError,
81+
InferenceOverwriteError,
82+
MroError,
83+
NameInferenceError,
84+
NoDefault,
85+
NotFoundError,
86+
OperationError,
87+
ParentMissingError,
88+
ResolveError,
89+
StatementMissing,
90+
SuperArgumentTypeError,
91+
SuperError,
92+
TooManyLevelsError,
93+
UnaryOperationError,
94+
UnresolvableName,
95+
UseInferenceDefault,
96+
)
6897
from astroid.inference_tip import _inference_tip_cached, inference_tip
6998
from astroid.objects import ExceptionInstance
7099

astroid/exceptions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
"NoDefault",
4343
"NotFoundError",
4444
"OperationError",
45+
"ParentMissingError",
4546
"ResolveError",
47+
"StatementMissing",
4648
"SuperArgumentTypeError",
4749
"SuperError",
4850
"TooManyLevelsError",

astroid/nodes/scoped_nodes/scoped_nodes.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,6 @@ def fully_defined(self):
636636
def statement(self, *, future: Literal[None] = ...) -> "Module":
637637
...
638638

639-
# pylint: disable-next=arguments-differ
640-
# https://github.com/PyCQA/pylint/issues/5264
641639
@overload
642640
def statement(self, *, future: Literal[True]) -> NoReturn:
643641
...

astroid/rebuilder.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,6 +1750,7 @@ def visit_attribute(
17501750
newnode = nodes.DelAttr(node.attr, node.lineno, node.col_offset, parent)
17511751
elif context == Context.Store:
17521752
if sys.version_info >= (3, 8):
1753+
# pylint: disable=redefined-variable-type
17531754
newnode = nodes.AssignAttr(
17541755
attrname=node.attr,
17551756
lineno=node.lineno,
@@ -2018,6 +2019,7 @@ def visit_name(
20182019
newnode = nodes.DelName(node.id, node.lineno, node.col_offset, parent)
20192020
elif context == Context.Store:
20202021
if sys.version_info >= (3, 8):
2022+
# pylint: disable=redefined-variable-type
20212023
newnode = nodes.AssignName(
20222024
name=node.id,
20232025
lineno=node.lineno,

pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ mixin-class-rgx=.*Mix[Ii]n
310310
# List of members which are set dynamically and missed by pylint inference
311311
# system, and so shouldn't trigger E0201 when accessed. Python regular
312312
# expressions are accepted.
313-
generated-members=REQUEST,acl_users,aq_parent
313+
generated-members=REQUEST,acl_users,aq_parent,argparse.Namespace
314314

315315

316316
[VARIABLES]

tests/unittest_builder.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ def func2(a={}):
715715
a.custom_attr = 0
716716
"""
717717
builder.parse(code)
718+
# pylint: disable=no-member
718719
nonetype = nodes.const_factory(None)
719720
self.assertNotIn("custom_attr", nonetype.locals)
720721
self.assertNotIn("custom_attr", nonetype.instance_attrs)

tests/unittest_lookup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ def test_builtin_lookup(self) -> None:
394394
self.assertEqual(len(intstmts), 1)
395395
self.assertIsInstance(intstmts[0], nodes.ClassDef)
396396
self.assertEqual(intstmts[0].name, "int")
397+
# pylint: disable=no-member
397398
self.assertIs(intstmts[0], nodes.const_factory(1)._proxied)
398399

399400
def test_decorator_arguments_lookup(self) -> None:

tests/unittest_nodes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ def test_as_string(self) -> None:
633633
class ConstNodeTest(unittest.TestCase):
634634
def _test(self, value: Any) -> None:
635635
node = nodes.const_factory(value)
636+
# pylint: disable=no-member
636637
self.assertIsInstance(node._proxied, nodes.ClassDef)
637638
self.assertEqual(node._proxied.name, value.__class__.__name__)
638639
self.assertIs(node.value, value)

tests/unittest_scoped_nodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def test_file_stream_api(self) -> None:
283283
path = resources.find("data/all.py")
284284
file_build = builder.AstroidBuilder().file_build(path, "all")
285285
with self.assertRaises(AttributeError):
286-
# pylint: disable=pointless-statement
286+
# pylint: disable=pointless-statement, no-member
287287
file_build.file_stream
288288

289289
def test_stream_api(self) -> None:

0 commit comments

Comments
 (0)