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

Merged revisions 70590,70650,70704,70768-70769,70776,71008,71010-71011 via svnmerge from

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

........
  r70590 | skip.montanaro | 2009-03-25 01:52:11 +0100 (Mi, 25 Mär 2009) | 1 line

  clarify the type of data returned
........
  r70650 | benjamin.peterson | 2009-03-28 20:16:10 +0100 (Sa, 28 Mär 2009) | 1 line

  give os.symlink and os.link() better parameter names #5564
........
  r70704 | benjamin.peterson | 2009-03-30 04:49:32 +0200 (Mo, 30 Mär 2009) | 1 line

  there's actually three methods here #5600
........
  r70768 | andrew.kuchling | 2009-03-31 00:29:15 +0200 (Di, 31 Mär 2009) | 1 line

  Typo fixes
........
  r70769 | andrew.kuchling | 2009-03-31 00:29:53 +0200 (Di, 31 Mär 2009) | 1 line

  Remove comment
........
  r70776 | andrew.kuchling | 2009-03-31 01:08:24 +0200 (Di, 31 Mär 2009) | 1 line

  typo fix
........
  r71008 | andrew.kuchling | 2009-04-02 02:02:14 +0200 (Do, 02 Apr 2009) | 1 line

  Typo fix
........
  r71010 | benjamin.peterson | 2009-04-02 02:11:52 +0200 (Do, 02 Apr 2009) | 1 line

  fix markup
........
  r71011 | benjamin.peterson | 2009-04-02 02:12:47 +0200 (Do, 02 Apr 2009) | 1 line

  this should be :noindex:
........
This commit is contained in:
Georg Brandl 2009-10-27 14:03:07 +00:00
parent ed1fd1d0e8
commit 785595448b
6 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/library/csv.rst
View file

@ -72,8 +72,8 @@ The :mod:`csv` module defines the following functions:
dialect. For full details about the dialect and formatting parameters, see dialect. For full details about the dialect and formatting parameters, see
section :ref:`csv-fmt-params`. section :ref:`csv-fmt-params`.
All data read are returned as strings. No automatic data type conversion is Each row read from the csv file is returned as a list of strings. No
performed. automatic data type conversion is performed.
A short usage example:: A short usage example::

2
Doc/library/json.rst
View file

@ -178,7 +178,7 @@ Basic Usage
to a :class:`unicode` object and passed to :func:`loads`. to a :class:`unicode` object and passed to :func:`loads`.
*object_hook* is an optional function that will be called with the result of *object_hook* is an optional function that will be called with the result of
any object literal decode (a :class:`dict`). The return value of any object literal decoded (a :class:`dict`). The return value of
*object_hook* will be used instead of the :class:`dict`. This feature can be used *object_hook* will be used instead of the :class:`dict`. This feature can be used
to implement custom decoders (e.g. JSON-RPC class hinting). to implement custom decoders (e.g. JSON-RPC class hinting).

10
Doc/library/os.rst
View file

@ -915,9 +915,10 @@ Files and Directories
.. versionadded:: 2.3 .. versionadded:: 2.3
.. function:: link(src, dst) .. function:: link(source, link_name)
Create a hard link pointing to *src* named *dst*. Availability: Unix. Create a hard link pointing to *source* named *link_name*. Availability:
Unix.
.. function:: listdir(path) .. function:: listdir(path)
@ -1238,9 +1239,10 @@ Files and Directories
Added access to values as attributes of the returned object. Added access to values as attributes of the returned object.
.. function:: symlink(src, dst) .. function:: symlink(source, link_name)
Create a symbolic link pointing to *src* named *dst*. Availability: Unix. Create a symbolic link pointing to *source* named *link_name*. Availability:
Unix.
.. function:: tempnam([dir[, prefix]]) .. function:: tempnam([dir[, prefix]])

1
Doc/library/string.rst
View file

@ -243,6 +243,7 @@ does an index lookup using :func:`__getitem__`.
Some simple format string examples:: Some simple format string examples::
"First, thou shalt count to {0}" # References first positional argument "First, thou shalt count to {0}" # References first positional argument
"Bring me a {}" # Implicitly references the first positional argument
"My quest is {name}" # References keyword argument 'name' "My quest is {name}" # References keyword argument 'name'
"Weight in tons {0.weight}" # 'weight' attribute of first positional arg "Weight in tons {0.weight}" # 'weight' attribute of first positional arg
"Units destroyed: {players[0]}" # First element of keyword argument 'players'. "Units destroyed: {players[0]}" # First element of keyword argument 'players'.

4
Doc/library/webbrowser.rst
View file

@ -176,8 +176,8 @@ Here are some simple examples::
Browser Controller Objects Browser Controller Objects
-------------------------- --------------------------
Browser controllers provide these methods which parallel two of the module-level Browser controllers provide these methods which parallel three of the
convenience functions: module-level convenience functions:
.. method:: controller.open(url[, new[, autoraise=1]]) .. method:: controller.open(url[, new[, autoraise=1]])

2
Doc/whatsnew/2.6.rst
View file

@ -84,8 +84,6 @@ for each change.
.. ======================================================================== .. ========================================================================
.. Large, PEP-level features and changes should be described here. .. Large, PEP-level features and changes should be described here.
.. Should there be a new section here for 3k migration?
.. Or perhaps a more general section describing module changes/deprecation?
.. ======================================================================== .. ========================================================================
Python 3.0 Python 3.0