diff options
| -rw-r--r-- | Doc/library/platform.rst | 2 | ||||
| -rw-r--r-- | Doc/library/tkinter.rst | 3 | ||||
| -rw-r--r-- | Lib/imputil.py | 8 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index cd90c38..9900278 100644 --- a/Doc/library/platform.rst +++ b/Doc/library/platform.rst @@ -169,7 +169,7 @@ Java Platform .. 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 diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index ce8085d..b1a1791 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -29,9 +29,6 @@ is maintained at ActiveState.) `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). diff --git a/Lib/imputil.py b/Lib/imputil.py index 0eba435..8b37ef4 100644 --- a/Lib/imputil.py +++ b/Lib/imputil.py @@ -14,7 +14,7 @@ warnpy3k("the imputil module has been removed in Python 3.0", stacklevel=2) 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 @@ import marshal __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 @@ def _test_revamp(): # 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 diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 3283643..c42cd0c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -6308,7 +6308,7 @@ unicode_center(PyUnicodeObject *self, PyObject *args) /* 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: */ |