[Python-checkins] r68274 - in python/branches/release30-maint: Doc/distutils/uploading.rst Doc/documenting/markup.rst Doc/library/ast.rst Doc/library/ctypes.rst Doc/library/decimal.rst Doc/library/fractions.rst Doc/library/tempfile.rst
georg.brandl
python-checkins at python.org
Sun Jan 4 01:02:52 CET 2009
Author: georg.brandl
Date: Sun Jan 4 01:02:52 2009
New Revision: 68274
Log:
Merged revisions 68224 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r68224 | georg.brandl | 2009-01-03 22:17:04 +0100 (Sat, 03 Jan 2009) | 9 lines
Merged revisions 68219 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix uses of the default role.
........
................
Modified:
python/branches/release30-maint/ (props changed)
python/branches/release30-maint/Doc/distutils/uploading.rst
python/branches/release30-maint/Doc/documenting/markup.rst
python/branches/release30-maint/Doc/library/ast.rst
python/branches/release30-maint/Doc/library/ctypes.rst
python/branches/release30-maint/Doc/library/decimal.rst
python/branches/release30-maint/Doc/library/fractions.rst
python/branches/release30-maint/Doc/library/tempfile.rst
Modified: python/branches/release30-maint/Doc/distutils/uploading.rst
==============================================================================
--- python/branches/release30-maint/Doc/distutils/uploading.rst (original)
+++ python/branches/release30-maint/Doc/distutils/uploading.rst Sun Jan 4 01:02:52 2009
@@ -33,9 +33,9 @@
be available for execution on the system :envvar:`PATH`. You can also specify
which key to use for signing using the :option:`--identity=*name*` option.
-Other :command:`upload` options include :option:`--repository=*url*`
-or :option:`--repository=*section*` where `url` is the url of the server
-and `section` the name of the section in :file:`$HOME/.pypirc`, and
+Other :command:`upload` options include :option:`--repository=<url>` or
+:option:`--repository=<section>` where *url* is the url of the server and
+*section* the name of the section in :file:`$HOME/.pypirc`, and
:option:`--show-response` (which displays the full response text from the PyPI
server for help in debugging upload problems).
Modified: python/branches/release30-maint/Doc/documenting/markup.rst
==============================================================================
--- python/branches/release30-maint/Doc/documenting/markup.rst (original)
+++ python/branches/release30-maint/Doc/documenting/markup.rst Sun Jan 4 01:02:52 2009
@@ -599,7 +599,7 @@
Example::
.. versionadded:: 2.5
- The `spam` parameter.
+ The *spam* parameter.
Note that there must be no blank line between the directive head and the
explanation; this is to make these blocks visually continuous in the markup.
@@ -760,7 +760,7 @@
Blank lines are not allowed within ``productionlist`` directive arguments.
The definition can contain token names which are marked as interpreted text
- (e.g. ``sum ::= `integer` "+" `integer```) -- this generates cross-references
+ (e.g. ``unaryneg ::= "-" `integer```) -- this generates cross-references
to the productions of these tokens.
Note that no further reST parsing is done in the production, so that you
Modified: python/branches/release30-maint/Doc/library/ast.rst
==============================================================================
--- python/branches/release30-maint/Doc/library/ast.rst (original)
+++ python/branches/release30-maint/Doc/library/ast.rst Sun Jan 4 01:02:52 2009
@@ -178,7 +178,7 @@
A node visitor base class that walks the abstract syntax tree and calls a
visitor function for every node found. This function may return a value
- which is forwarded by the `visit` method.
+ which is forwarded by the :meth:`visit` method.
This class is meant to be subclassed, with the subclass adding visitor
methods.
@@ -207,11 +207,11 @@
A :class:`NodeVisitor` subclass that walks the abstract syntax tree and
allows modification of nodes.
- The `NodeTransformer` will walk the AST and use the return value of the
- visitor methods to replace or remove the old node. If the return value of
- the visitor method is ``None``, the node will be removed from its location,
- otherwise it is replaced with the return value. The return value may be the
- original node in which case no replacement takes place.
+ The :class:`NodeTransformer` will walk the AST and use the return value of
+ the visitor methods to replace or remove the old node. If the return value
+ of the visitor method is ``None``, the node will be removed from its
+ location, otherwise it is replaced with the return value. The return value
+ may be the original node in which case no replacement takes place.
Here is an example transformer that rewrites all occurrences of name lookups
(``foo``) to ``data['foo']``::
Modified: python/branches/release30-maint/Doc/library/ctypes.rst
==============================================================================
--- python/branches/release30-maint/Doc/library/ctypes.rst (original)
+++ python/branches/release30-maint/Doc/library/ctypes.rst Sun Jan 4 01:02:52 2009
@@ -1376,24 +1376,22 @@
The *mode* parameter can be used to specify how the library is loaded. For
details, consult the ``dlopen(3)`` manpage, on Windows, *mode* is ignored.
-The *use_errno* parameter, when set to True, enables a ctypes
-mechanism that allows to access the system `errno` error number in a
-safe way. `ctypes` maintains a thread-local copy of the systems
-`errno` variable; if you call foreign functions created with
-`use_errno=True` then the `errno` value before the function call is
-swapped with the ctypes private copy, the same happens immediately
-after the function call.
-
-The function `ctypes.get_errno()` returns the value of the ctypes
-private copy, and the function `ctypes.set_errno(value)` changes the
-ctypes private copy to `value` and returns the former value.
-
-The *use_last_error* parameter, when set to True, enables the same
-mechanism for the Windows error code which is managed by the
-:func:`GetLastError` and :func:`SetLastError` Windows API functions;
-`ctypes.get_last_error()` and `ctypes.set_last_error(value)` are used
-to request and change the ctypes private copy of the windows error
-code.
+The *use_errno* parameter, when set to True, enables a ctypes mechanism that
+allows to access the system :data:`errno` error number in a safe way.
+:mod:`ctypes` maintains a thread-local copy of the systems :data:`errno`
+variable; if you call foreign functions created with ``use_errno=True`` then the
+:data:`errno` value before the function call is swapped with the ctypes private
+copy, the same happens immediately after the function call.
+
+The function :func:`ctypes.get_errno` returns the value of the ctypes private
+copy, and the function :func:`ctypes.set_errno` changes the ctypes private copy
+to a new value and returns the former value.
+
+The *use_last_error* parameter, when set to True, enables the same mechanism for
+the Windows error code which is managed by the :func:`GetLastError` and
+:func:`SetLastError` Windows API functions; :func:`ctypes.get_last_error` and
+:func:`ctypes.set_last_error` are used to request and change the ctypes private
+copy of the windows error code.
.. data:: RTLD_GLOBAL
:noindex:
@@ -1596,18 +1594,20 @@
.. function:: CFUNCTYPE(restype, *argtypes, use_errno=False, use_last_error=False)
The returned function prototype creates functions that use the standard C
- calling convention. The function will release the GIL during the call.
- If `use_errno` is set to True, the ctypes private copy of the system `errno`
- variable is exchanged with the real `errno` value bafore and after the call;
- `use_last_error` does the same for the Windows error code.
+ calling convention. The function will release the GIL during the call. If
+ *use_errno* is set to True, the ctypes private copy of the system
+ :data:`errno` variable is exchanged with the real :data:`errno` value bafore
+ and after the call; *use_last_error* does the same for the Windows error
+ code.
.. function:: WINFUNCTYPE(restype, *argtypes, use_errno=False, use_last_error=False)
Windows only: The returned function prototype creates functions that use the
- ``stdcall`` calling convention, except on Windows CE where :func:`WINFUNCTYPE`
- is the same as :func:`CFUNCTYPE`. The function will release the GIL during the
- call. `use_errno` and `use_last_error` have the same meaning as above.
+ ``stdcall`` calling convention, except on Windows CE where
+ :func:`WINFUNCTYPE` is the same as :func:`CFUNCTYPE`. The function will
+ release the GIL during the call. *use_errno* and *use_last_error* have the
+ same meaning as above.
.. function:: PYFUNCTYPE(restype, *argtypes)
@@ -1852,10 +1852,10 @@
.. function:: find_library(name)
:module: ctypes.util
- Try to find a library and return a pathname. `name` is the library name without
- any prefix like `lib`, suffix like ``.so``, ``.dylib`` or version number (this
- is the form used for the posix linker option :option:`-l`). If no library can
- be found, returns ``None``.
+ Try to find a library and return a pathname. *name* is the library name
+ without any prefix like ``lib```, suffix like ``.so``, ``.dylib`` or version
+ number (this is the form used for the posix linker option :option:`-l`). If
+ no library can be found, returns ``None``.
The exact functionality is system dependent.
@@ -1887,12 +1887,12 @@
.. function:: get_errno()
Returns the current value of the ctypes-private copy of the system
- `errno` variable in the calling thread.
+ :data:`errno` variable in the calling thread.
.. function:: get_last_error()
Windows only: returns the current value of the ctypes-private copy of the system
- `LastError` variable in the calling thread.
+ :data:`LastError` variable in the calling thread.
.. function:: memmove(dst, src, count)
@@ -1947,15 +1947,14 @@
.. function:: set_errno(value)
- Set the current value of the ctypes-private copy of the system
- `errno` variable in the calling thread to `value` and return the
- previous value.
+ Set the current value of the ctypes-private copy of the system :data:`errno`
+ variable in the calling thread to *value* and return the previous value.
.. function:: set_last_error(value)
- Windows only: set the current value of the ctypes-private copy of
- the system `LastError` variable in the calling thread to `value`
- and return the previous value.
+ Windows only: set the current value of the ctypes-private copy of the system
+ :data:`LastError` variable in the calling thread to *value* and return the
+ previous value.
.. function:: sizeof(obj_or_type)
Modified: python/branches/release30-maint/Doc/library/decimal.rst
==============================================================================
--- python/branches/release30-maint/Doc/library/decimal.rst (original)
+++ python/branches/release30-maint/Doc/library/decimal.rst Sun Jan 4 01:02:52 2009
@@ -1071,7 +1071,7 @@
.. method:: logical_and(x, y)
- Applies the logical operation `and` between each operand's digits.
+ Applies the logical operation *and* between each operand's digits.
.. method:: logical_invert(x)
@@ -1081,12 +1081,12 @@
.. method:: logical_or(x, y)
- Applies the logical operation `or` between each operand's digits.
+ Applies the logical operation *or* between each operand's digits.
.. method:: logical_xor(x, y)
- Applies the logical operation `xor` between each operand's digits.
+ Applies the logical operation *xor* between each operand's digits.
.. method:: max(x, y)
@@ -1194,8 +1194,8 @@
.. method:: remainder_near(x, y)
- Returns `x - y * n`, where *n* is the integer nearest the exact value
- of `x / y` (if the result is `0` then its sign will be the sign of *x*).
+ Returns ``x - y * n``, where *n* is the integer nearest the exact value
+ of ``x / y`` (if the result is 0 then its sign will be the sign of *x*).
.. method:: rotate(x, y)
Modified: python/branches/release30-maint/Doc/library/fractions.rst
==============================================================================
--- python/branches/release30-maint/Doc/library/fractions.rst (original)
+++ python/branches/release30-maint/Doc/library/fractions.rst Sun Jan 4 01:02:52 2009
@@ -126,11 +126,11 @@
.. function:: gcd(a, b)
- Return the greatest common divisor of the integers `a` and `b`. If
- either `a` or `b` is nonzero, then the absolute value of `gcd(a,
- b)` is the largest integer that divides both `a` and `b`. `gcd(a,b)`
- has the same sign as `b` if `b` is nonzero; otherwise it takes the sign
- of `a`. `gcd(0, 0)` returns `0`.
+ Return the greatest common divisor of the integers *a* and *b*. If either
+ *a* or *b* is nonzero, then the absolute value of ``gcd(a, b)`` is the
+ largest integer that divides both *a* and *b*. ``gcd(a,b)`` has the same
+ sign as *b* if *b* is nonzero; otherwise it takes the sign of *a*. ``gcd(0,
+ 0)`` returns ``0``.
.. seealso::
Modified: python/branches/release30-maint/Doc/library/tempfile.rst
==============================================================================
--- python/branches/release30-maint/Doc/library/tempfile.rst (original)
+++ python/branches/release30-maint/Doc/library/tempfile.rst Sun Jan 4 01:02:52 2009
@@ -149,11 +149,11 @@
.. warning::
- Use of this function may introduce a security hole in your program.
- By the time you get around to doing anything with the file name it
- returns, someone else may have beaten you to the punch.
- :func:`mktemp` usage can be replaced easily with
- :func:`NamedTemporaryFile`, passing it the `delete=False` parameter::
+ Use of this function may introduce a security hole in your program. By
+ the time you get around to doing anything with the file name it returns,
+ someone else may have beaten you to the punch. :func:`mktemp` usage can
+ be replaced easily with :func:`NamedTemporaryFile`, passing it the
+ ``delete=False`` parameter::
>>> f = NamedTemporaryFile(delete=False)
>>> f
More information about the Python-checkins
mailing list