[Python-checkins] r73260 - in python/trunk: Doc/library/platform.rst Doc/library/tkinter.rst Lib/imputil.py Objects/unicodeobject.c

[georg.brandl]

Author: georg.brandl
Date: Sat Jun  6 20:21:58 2009
New Revision: 73260

Log:
#6224: s/JPython/Jython/, and remove one link to a module nine years old.

Modified:
   python/trunk/Doc/library/platform.rst
   python/trunk/Doc/library/tkinter.rst
   python/trunk/Lib/imputil.py
   python/trunk/Objects/unicodeobject.c

Modified: python/trunk/Doc/library/platform.rst
==============================================================================
--- python/trunk/Doc/library/platform.rst	(original)
+++ python/trunk/Doc/library/platform.rst	Sat Jun  6 20:21:58 2009
@@ -169,7 +169,7 @@
 
 .. function:: java_ver(release='', vendor='', vminfo=('','',''), osinfo=('','',''))
 
-   Version interface for JPython.
+   Version interface for Jython.
 
    Returns a tuple ``(release, vendor, vminfo, osinfo)`` with *vminfo* being a
    tuple ``(vm_name, vm_release, vm_vendor)`` and *osinfo* being a tuple

Modified: python/trunk/Doc/library/tkinter.rst
==============================================================================
--- python/trunk/Doc/library/tkinter.rst	(original)
+++ python/trunk/Doc/library/tkinter.rst	Sat Jun  6 20:21:58 2009
@@ -29,9 +29,6 @@
    `Tkinter reference: a GUI for Python <http://infohost.nmt.edu/tcc/help/pubs/lang.html>`_
       On-line reference material.
 
-   `Tkinter for JPython <http://jtkinter.sourceforge.net>`_
-      The Jython interface to Tkinter.
-
    `Python and Tkinter Programming <http://www.amazon.com/exec/obidos/ASIN/1884777813>`_
       The book by John Grayson (ISBN 1-884777-81-3).
 

Modified: python/trunk/Lib/imputil.py
==============================================================================
--- python/trunk/Lib/imputil.py	(original)
+++ python/trunk/Lib/imputil.py	Sat Jun  6 20:21:58 2009
@@ -14,7 +14,7 @@
 del warnpy3k
 
 # note: avoid importing non-builtin modules
-import imp                      ### not available in JPython?
+import imp                      ### not available in Jython?
 import sys
 import __builtin__
 
@@ -25,7 +25,7 @@
 __all__ = ["ImportManager","Importer","BuiltinImporter"]
 
 _StringType = type('')
-_ModuleType = type(sys)         ### doesn't work in JPython...
+_ModuleType = type(sys)         ### doesn't work in Jython...
 
 class ImportManager:
     "Manage the import process."
@@ -639,8 +639,8 @@
 # TODO
 #
 # from Finn Bock:
-#   type(sys) is not a module in JPython. what to use instead?
-#   imp.C_EXTENSION is not in JPython. same for get_suffixes and new_module
+#   type(sys) is not a module in Jython. what to use instead?
+#   imp.C_EXTENSION is not in Jython. same for get_suffixes and new_module
 #
 #   given foo.py of:
 #      import sys

Modified: python/trunk/Objects/unicodeobject.c
==============================================================================
--- python/trunk/Objects/unicodeobject.c	(original)
+++ python/trunk/Objects/unicodeobject.c	Sat Jun  6 20:21:58 2009
@@ -6308,7 +6308,7 @@
 
 /* This code should go into some future Unicode collation support
    module. The basic comparison should compare ordinals on a naive
-   basis (this is what Java does and thus JPython too). */
+   basis (this is what Java does and thus Jython too). */
 
 /* speedy UTF-16 code point order comparison */
 /* gleaned from: */