summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/site.py10
-rw-r--r--Misc/NEWS3
2 files changed, 9 insertions, 4 deletions
diff --git a/Lib/site.py b/Lib/site.py
index a954704..9b1d5bb 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -598,14 +598,16 @@ def _script():
"""
args = sys.argv[1:]
if not args:
+ user_base = getuserbase()
+ user_site = getusersitepackages()
print("sys.path = [")
for dir in sys.path:
print(" %r," % (dir,))
print("]")
- print("USER_BASE: %r (%s)" % (USER_BASE,
- "exists" if os.path.isdir(USER_BASE) else "doesn't exist"))
- print("USER_SITE: %r (%s)" % (USER_SITE,
- "exists" if os.path.isdir(USER_SITE) else "doesn't exist"))
+ print("USER_BASE: %r (%s)" % (user_base,
+ "exists" if os.path.isdir(user_base) else "doesn't exist"))
+ print("USER_SITE: %r (%s)" % (user_site,
+ "exists" if os.path.isdir(user_site) else "doesn't exist"))
print("ENABLE_USER_SITE: %r" % ENABLE_USER_SITE)
sys.exit(0)
diff --git a/Misc/NEWS b/Misc/NEWS
index c50b41a..9284be3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,9 @@ Core and Builtins
Library
-------
+- Issue #16804: Fix a bug in the 'site' module that caused running
+ 'python -S -m site' to incorrectly throw an exception.
+
- Issue #15480: Remove the deprecated and unused TYPE_INT64 code from marshal.
Initial patch by Daniel Riti.