Skip to content

Remove distutils path patching #1321

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

Merged
merged 7 commits into from
Dec 31, 2021
Merged

Remove distutils path patching #1321

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4ded26
Fix ``distutils`` path patching for setuptools >= 60.0.0
DanielNoord Dec 29, 2021
459691a
Remove distutils path thingy
DanielNoord Dec 31, 2021
a4115a2
Update astroid/interpreter/_import/spec.py
DanielNoord Dec 31, 2021
69fe5db
Add changelog
DanielNoord Dec 31, 2021
2707f09
Merge branch 'fix-distutils' of https://github.com/DanielNoord/astroi…
DanielNoord Dec 31, 2021
199385e
Add a dot for Marc :)
DanielNoord Dec 31, 2021
917ee0d
Update ChangeLog
DanielNoord Dec 31, 2021
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
6 changes: 0 additions & 6 deletions astroid/interpreter/_import/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import abc
import collections
import distutils
import enum
import importlib.machinery
import os
Expand Down Expand Up @@ -162,11 +161,6 @@ def contribute_to_path(self, spec, processed):
if os.path.isdir(os.path.join(p, *processed))
]
# We already import distutils elsewhere in astroid,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example, to remove this comment 😅

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can add Co-authored-by: Marc Mueller <[email protected]> when cleaning the squash message up :)

# so if it is the same module, we can use it directly.
elif spec.name == "distutils" and spec.location in distutils.__path__:
# distutils is patched inside virtualenvs to pick up submodules
# from the original Python, not from the virtualenv itself.
path = list(distutils.__path__)
else:
path = [spec.location]
return path
Expand Down
5 changes: 0 additions & 5 deletions tests/unittest_modutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"""
unit tests for module modutils (module manipulation utilities)
"""
import distutils.version
import email
import os
import shutil
Expand Down Expand Up @@ -72,10 +71,6 @@ def test_find_egg_module(self) -> None:
["data", "MyPyPa-0.1.0-py2.5.egg", self.package],
)

def test_find_distutils_submodules_in_virtualenv(self) -> None:
found_spec = spec.find_spec(["distutils", "version"])
self.assertEqual(found_spec.location, distutils.version.__file__)


class LoadModuleFromNameTest(unittest.TestCase):
"""load a python module from it's name"""
Expand Down