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
e6d7c406
Commit
e6d7c406
authored
Oct 01, 2016
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable nspkg.pth behavior on Python 3.3+. Fixes #805 and fixes pypa/pip#1924.
parent
ae50b560
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
CHANGES.rst
CHANGES.rst
+6
-0
setuptools/command/install_egg_info.py
setuptools/command/install_egg_info.py
+2
-1
No files found.
CHANGES.rst
View file @
e6d7c406
...
...
@@ -2,6 +2,12 @@
CHANGES
=======
v28
.1.0
-------
*
#
805
:
Disable
``-
nspkg
.
pth
``
behavior
on
Python
3.3
+
where
PEP
-
420
functionality
is
adequate
.
Fixes
pip
#
1924.
v28
.0.0
-------
...
...
setuptools/command/install_egg_info.py
View file @
e6d7c406
...
...
@@ -82,9 +82,10 @@ class install_egg_info(Command):
_nspkg_tmpl
=
(
"import sys, types, os"
,
"pep420 = sys.version_info > (3, 3)"
,
"p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)"
,
"ie = os.path.exists(os.path.join(p,'__init__.py'))"
,
"m = not ie and "
"m = not ie and
not pep420 and
"
"sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))"
,
"mp = (m or []) and m.__dict__.setdefault('__path__',[])"
,
"(p not in mp) and mp.append(p)"
,
...
...
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