(original) (raw)

changeset: 86634:90c56229efb7 user: Antoine Pitrou solipsis@pitrou.net date: Fri Oct 25 21:39:26 2013 +0200 files: Doc/library/site.rst Doc/whatsnew/3.4.rst Lib/site.py Misc/NEWS description: Issue #19375: The site module adding a "site-python" directory to sys.path, if it exists, is now deprecated. diff -r a2ed12e014ef -r 90c56229efb7 Doc/library/site.rst --- a/Doc/library/site.rst Fri Oct 25 21:36:10 2013 +0200 +++ b/Doc/library/site.rst Fri Oct 25 21:39:26 2013 +0200 @@ -38,6 +38,9 @@ if it refers to an existing directory, and if so, adds it to ``sys.path`` and also inspects the newly added path for configuration files. +.. deprecated:: 3.4 + Support for the "site-python" directory will be removed in 3.5. + If a file named "pyvenv.cfg" exists one directory above sys.executable, sys.prefix and sys.exec_prefix are set to that directory and it is also checked for site-packages and site-python (sys.base_prefix and diff -r a2ed12e014ef -r 90c56229efb7 Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst Fri Oct 25 21:36:10 2013 +0200 +++ b/Doc/whatsnew/3.4.rst Fri Oct 25 21:39:26 2013 +0200 @@ -685,7 +685,8 @@ Deprecated features ------------------- -* No feature deprecations are planned for Python 3.4. +* The site module adding a "site-python" directory to sys.path, if it + exists, is deprecated (:issue:`19375`). Porting to Python 3.4 diff -r a2ed12e014ef -r 90c56229efb7 Lib/site.py --- a/Lib/site.py Fri Oct 25 21:36:10 2013 +0200 +++ b/Lib/site.py Fri Oct 25 21:39:26 2013 +0200 @@ -326,6 +326,11 @@ """Add site-packages (and possibly site-python) to sys.path""" for sitedir in getsitepackages(prefixes): if os.path.isdir(sitedir): + if "site-python" in sitedir: + import warnings + warnings.warn('"site-python" directories will not be ' + 'supported in 3.5 anymore', + DeprecationWarning) addsitedir(sitedir, known_paths) return known_paths diff -r a2ed12e014ef -r 90c56229efb7 Misc/NEWS --- a/Misc/NEWS Fri Oct 25 21:36:10 2013 +0200 +++ b/Misc/NEWS Fri Oct 25 21:39:26 2013 +0200 @@ -27,6 +27,9 @@ Library ------- +- Issue #19375: The site module adding a "site-python" directory to sys.path, + if it exists, is now deprecated. + - Issue #19379: Lazily import linecache in the warnings module, to make startup with warnings faster until a warning gets printed. /solipsis@pitrou.net