mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 73190,73213,73257-73258,73260,73275,73294 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73190 | georg.brandl | 2009-06-04 01:23:45 +0200 (Do, 04 Jun 2009) | 2 lines

  Avoid PendingDeprecationWarnings emitted by deprecated unittest methods.
........
  r73213 | georg.brandl | 2009-06-04 12:15:57 +0200 (Do, 04 Jun 2009) | 1 line

  #5967: note that the C slicing APIs do not support negative indices.
........
  r73257 | georg.brandl | 2009-06-06 19:50:05 +0200 (Sa, 06 Jun 2009) | 1 line

  #6211: elaborate a bit on ways to call the function.
........
  r73258 | georg.brandl | 2009-06-06 19:51:31 +0200 (Sa, 06 Jun 2009) | 1 line

  #6204: use a real reference instead of "see later".
........
  r73260 | georg.brandl | 2009-06-06 20:21:58 +0200 (Sa, 06 Jun 2009) | 1 line

  #6224: s/JPython/Jython/, and remove one link to a module nine years old.
........
  r73275 | georg.brandl | 2009-06-07 22:37:52 +0200 (So, 07 Jun 2009) | 1 line

  Add Ezio.
........
  r73294 | georg.brandl | 2009-06-08 15:34:52 +0200 (Mo, 08 Jun 2009) | 1 line

  #6194: O_SHLOCK/O_EXLOCK are not really more platform independent than lockf().
........
This commit is contained in:
Georg Brandl 2009-06-08 13:41:29 +00:00
parent 8d8f197c9c
commit c6c3178942
8 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/library/fcntl.rst
View file

@ -145,7 +145,6 @@ lay-out for the *lockdata* variable is system dependent --- therefore using the
Module :mod:`os`
If the locking flags :const:`O_SHLOCK` and :const:`O_EXLOCK` are present
in the :mod:`os` module, the :func:`os.open` function provides a more
platform-independent alternative to the :func:`lockf` and :func:`flock`
functions.
in the :mod:`os` module (on BSD only), the :func:`os.open` function
provides an alternative to the :func:`lockf` and :func:`flock` functions.

2
Doc/library/platform.rst
View file

@ -160,7 +160,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

3
Doc/library/tkinter.rst
View file

@ -23,9 +23,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).