summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-03-22 22:52:11 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-03-22 22:52:11 (GMT)
commit176cda11dffa7759dae138b49f103e6411e6679e (patch)
treed81a0208367dfe91fa91959713d85b2b37b6d92c
parente1f4c92d23d9fb71bbaf76be12e80757c7d43e6a (diff)
downloadcpython-176cda11dffa7759dae138b49f103e6411e6679e.zip
cpython-176cda11dffa7759dae138b49f103e6411e6679e.tar.gz
cpython-176cda11dffa7759dae138b49f103e6411e6679e.tar.bz2
Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only).
-rw-r--r--Lib/site.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/site.py b/Lib/site.py
index e391670..b36df1f 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -118,7 +118,7 @@ def addbuilddir():
s = "build/lib.%s-%.3s" % (get_platform(), sys.version)
if hasattr(sys, 'gettotalrefcount'):
s += '-pydebug'
- s = os.path.join(os.path.dirname(sys.path[-1]), s)
+ s = os.path.join(os.path.dirname(sys.path.pop()), s)
sys.path.append(s)
diff --git a/Misc/NEWS b/Misc/NEWS
index f05e90e..7395196 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@ Core and Builtins
Library
-------
+- Issue #8205: Remove the "Modules" directory from sys.path when Python is
+ running from the build directory (POSIX only).
+
- Issue #7667: Fix doctest failures with non-ASCII paths.
- Issue #7512: shutil.copystat() could raise an OSError when the filesystem