mirror of https://github.com/python/cpython
Fix `credits' to credit the Jython developers when running under that
interpreter. Update and reword the credits for CPython. Closes SF patch #102665.
This commit is contained in:
parent
b6a54d2a2c
commit
23f26ce813
12
Lib/site.py
12
Lib/site.py
|
@ -201,8 +201,14 @@ class _Printer:
|
||||||
break
|
break
|
||||||
|
|
||||||
__builtin__.copyright = _Printer("copyright", sys.copyright)
|
__builtin__.copyright = _Printer("copyright", sys.copyright)
|
||||||
__builtin__.credits = _Printer("credits",
|
if sys.platform[:4] == 'java':
|
||||||
"Python development is led by BeOpen PythonLabs (www.pythonlabs.com).")
|
__builtin__.credits = _Printer(
|
||||||
|
"credits",
|
||||||
|
"Jython is maintained by the Jython developers (www.jython.org).")
|
||||||
|
else:
|
||||||
|
__builtin__.credits = _Printer("credits", """\
|
||||||
|
Thanks to CWI, CNRI, BeOpen.com, Digital Creations and a cast of thousands
|
||||||
|
for supporting Python development. See www.python.org for more information.""")
|
||||||
here = os.path.dirname(os.__file__)
|
here = os.path.dirname(os.__file__)
|
||||||
__builtin__.license = _Printer(
|
__builtin__.license = _Printer(
|
||||||
"license", "See http://www.pythonlabs.com/products/python2.0/license.html",
|
"license", "See http://www.pythonlabs.com/products/python2.0/license.html",
|
||||||
|
@ -242,7 +248,7 @@ except ImportError:
|
||||||
#
|
#
|
||||||
# Remove sys.setdefaultencoding() so that users cannot change the
|
# Remove sys.setdefaultencoding() so that users cannot change the
|
||||||
# encoding after initialization. The test for presence is needed when
|
# encoding after initialization. The test for presence is needed when
|
||||||
# this module is run as a script, becuase this code is executed twice.
|
# this module is run as a script, because this code is executed twice.
|
||||||
#
|
#
|
||||||
if hasattr(sys, "setdefaultencoding"):
|
if hasattr(sys, "setdefaultencoding"):
|
||||||
del sys.setdefaultencoding
|
del sys.setdefaultencoding
|
||||||
|
|
Loading…
Reference in New Issue