diff options
| author | Meador Inge <meadori@gmail.com> | 2013-04-14 01:51:04 (GMT) |
|---|---|---|
| committer | Meador Inge <meadori@gmail.com> | 2013-04-14 01:51:04 (GMT) |
| commit | 2581bdb86a1db29091e5a67ef022415f65909f0f (patch) | |
| tree | 92d5dcdc7ec822380f8d32a0f56eea8d7515b3a8 /Lib | |
| parent | d949126995a7ff63590285aa816da65d97a31403 (diff) | |
| parent | 9a7a81195ce42efc92fac04c19a2fe9f0562ef51 (diff) | |
| download | cpython-2581bdb86a1db29091e5a67ef022415f65909f0f.zip cpython-2581bdb86a1db29091e5a67ef022415f65909f0f.tar.gz cpython-2581bdb86a1db29091e5a67ef022415f65909f0f.tar.bz2 | |
Issue #16804: Fix 'python -S -m site' failure.
This commit fixes a bug in the 'site' module that was causing an exception
to incorrectly be thrown when running 'python -S -m site'. The problem was
that 'USER_BASE' and 'USER_SITE' were being accessed before they were properly
initialized. The code has been changed to use 'getuserbase' and
'getusersitepackages' instead so that the initialization always happens.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/site.py | 10 |
1 files changed, 6 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) |