Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
dcc71f77
Commit
dcc71f77
authored
Jul 26, 2020
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename _distutils_importer to _distutils_hack, as it supplies more than just an importer.
parent
1e53a2c1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
_distutils_hack/__init__.py
_distutils_hack/__init__.py
+0
-0
_distutils_hack/install.py
_distutils_hack/install.py
+0
-0
_distutils_hack/override.py
_distutils_hack/override.py
+0
-0
conftest.py
conftest.py
+1
-1
setup.py
setup.py
+1
-1
setuptools/__init__.py
setuptools/__init__.py
+1
-1
setuptools/sandbox.py
setuptools/sandbox.py
+4
-4
No files found.
_distutils_
importer
/__init__.py
→
_distutils_
hack
/__init__.py
View file @
dcc71f77
File moved
_distutils_
importer
/install.py
→
_distutils_
hack
/install.py
View file @
dcc71f77
File moved
_distutils_
importer
/override.py
→
_distutils_
hack
/override.py
View file @
dcc71f77
File moved
conftest.py
View file @
dcc71f77
...
...
@@ -15,7 +15,7 @@ collect_ignore = [
'tests/manual_test.py'
,
'setuptools/tests/mod_with_constant.py'
,
'setuptools/_distutils'
,
'_distutils_
importer
'
,
'_distutils_
hack
'
,
]
...
...
setup.py
View file @
dcc71f77
...
...
@@ -95,7 +95,7 @@ class install_with_pth(install):
def
initialize_options
(
self
):
install
.
initialize_options
(
self
)
self
.
extra_path
=
(
'distutils-precedence'
,
'import _distutils_
importer
.install'
)
'distutils-precedence'
,
'import _distutils_
hack
.install'
)
def
finalize_options
(
self
):
install
.
finalize_options
(
self
)
...
...
setuptools/__init__.py
View file @
dcc71f77
...
...
@@ -5,7 +5,7 @@ import functools
import
os
import
re
import
_distutils_
importer
.override
# noqa: F401
import
_distutils_
hack
.override
# noqa: F401
import
distutils.core
from
distutils.errors
import
DistutilsOptionError
...
...
setuptools/sandbox.py
View file @
dcc71f77
...
...
@@ -200,7 +200,7 @@ _MODULES_TO_HIDE = {
'distutils'
,
'pkg_resources'
,
'Cython'
,
'_distutils_
importer
'
,
'_distutils_
hack
'
,
}
...
...
@@ -232,9 +232,9 @@ def hide_setuptools():
necessary to avoid issues such as #315 where setuptools upgrading itself
would fail to find a function declared in the metadata.
"""
_distutils_
importer
=
sys
.
modules
.
get
(
'_distutils_importer
'
,
None
)
if
_distutils_
importer
is
not
None
:
_distutils_
importer
.
remove_shim
()
_distutils_
hack
=
sys
.
modules
.
get
(
'_distutils_hack
'
,
None
)
if
_distutils_
hack
is
not
None
:
_distutils_
hack
.
remove_shim
()
modules
=
filter
(
_needs_hiding
,
sys
.
modules
)
_clear_modules
(
modules
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment