summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2000-12-06 22:20:07 (GMT)
committerBarry Warsaw <barry@python.org>2000-12-06 22:20:07 (GMT)
commit23f26ce813910aec4bb1c0c80ec10f2909a838d5 (patch)
tree325ae166de89bc59d0b3943d9f635cc8be1dec58
parentb6a54d2a2cd0537be8e013a96068a8ffeaee5847 (diff)
downloadcpython-23f26ce813910aec4bb1c0c80ec10f2909a838d5.zip
cpython-23f26ce813910aec4bb1c0c80ec10f2909a838d5.tar.gz
cpython-23f26ce813910aec4bb1c0c80ec10f2909a838d5.tar.bz2
Fix `credits' to credit the Jython developers when running under that
interpreter. Update and reword the credits for CPython. Closes SF patch #102665.
-rw-r--r--Lib/site.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/Lib/site.py b/Lib/site.py
index dc1b614..52ad11d 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -201,8 +201,14 @@ class _Printer:
break
__builtin__.copyright = _Printer("copyright", sys.copyright)
-__builtin__.credits = _Printer("credits",
- "Python development is led by BeOpen PythonLabs (www.pythonlabs.com).")
+if sys.platform[:4] == 'java':
+ __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__)
__builtin__.license = _Printer(
"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
# 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"):
del sys.setdefaultencoding