[Python-checkins] CVS: python/dist/src/Lib site.py,1.20,1.21

[Barry Warsaw]

Update of /cvsroot/python/python/dist/src/Lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13019

Modified Files:
	site.py 
Log Message:
Fix `credits' to credit the Jython developers when running under that
interpreter.  Update and reword the credits for CPython.  Closes SF
patch #102665.


Index: site.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** site.py	2000/10/03 17:11:37	1.20
--- site.py	2000/12/06 22:20:07	1.21
***************
*** 202,207 ****
  
  __builtin__.copyright = _Printer("copyright", sys.copyright)
! __builtin__.credits = _Printer("credits",
!     "Python development is led by BeOpen PythonLabs (www.pythonlabs.com).")
  here = os.path.dirname(os.__file__)
  __builtin__.license = _Printer(
--- 202,213 ----
  
  __builtin__.copyright = _Printer("copyright", sys.copyright)
! 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(
***************
*** 243,247 ****
  # 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.
  #
  if hasattr(sys, "setdefaultencoding"):
--- 249,253 ----
  # 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, because this code is executed twice.
  #
  if hasattr(sys, "setdefaultencoding"):