[Python-checkins] r87889 - in python/branches/release27-maint/Doc: library/inspect.rst reference/executionmodel.rst
georg.brandl
python-checkins at python.org
Sun Jan 9 09:04:38 CET 2011
Author: georg.brandl
Date: Sun Jan 9 09:04:37 2011
New Revision: 87889
Log:
Hand-port parts of r87789.
Modified:
python/branches/release27-maint/Doc/library/inspect.rst
python/branches/release27-maint/Doc/reference/executionmodel.rst
Modified: python/branches/release27-maint/Doc/library/inspect.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/inspect.rst (original)
+++ python/branches/release27-maint/Doc/library/inspect.rst Sun Jan 9 09:04:37 2011
@@ -234,14 +234,14 @@
Return a tuple of values that describe how Python will interpret the file
identified by *path* if it is a module, or ``None`` if it would not be
- identified as a module. The return tuple is ``(name, suffix, mode, mtype)``,
- where *name* is the name of the module without the name of any enclosing
- package, *suffix* is the trailing part of the file name (which may not be a
- dot-delimited extension), *mode* is the :func:`open` mode that would be used
- (``'r'`` or ``'rb'``), and *mtype* is an integer giving the type of the
- module. *mtype* will have a value which can be compared to the constants
- defined in the :mod:`imp` module; see the documentation for that module for
- more information on module types.
+ identified as a module. The return tuple is ``(name, suffix, mode,
+ module_type)``, where *name* is the name of the module without the name of
+ any enclosing package, *suffix* is the trailing part of the file name (which
+ may not be a dot-delimited extension), *mode* is the :func:`open` mode that
+ would be used (``'r'`` or ``'rb'``), and *module_type* is an integer giving
+ the type of the module. *module_type* will have a value which can be
+ compared to the constants defined in the :mod:`imp` module; see the
+ documentation for that module for more information on module types.
.. versionchanged:: 2.6
Returns a :term:`named tuple` ``ModuleInfo(name, suffix, mode,
@@ -464,12 +464,13 @@
.. function:: getargspec(func)
- Get the names and default values of a Python function's arguments. A tuple of four
- things is returned: ``(args, varargs, varkw, defaults)``. *args* is a list of
- the argument names (it may contain nested lists). *varargs* and *varkw* are the
- names of the ``*`` and ``**`` arguments or ``None``. *defaults* is a tuple of
- default argument values or None if there are no default arguments; if this tuple
- has *n* elements, they correspond to the last *n* elements listed in *args*.
+ Get the names and default values of a Python function's arguments. A tuple of
+ four things is returned: ``(args, varargs, keywords, defaults)``. *args* is a
+ list of the argument names (it may contain nested lists). *varargs* and
+ *keywords* are the names of the ``*`` and ``**`` arguments or
+ ``None``. *defaults* is a tuple of default argument values or None if there
+ are no default arguments; if this tuple has *n* elements, they correspond to
+ the last *n* elements listed in *args*.
.. versionchanged:: 2.6
Returns a :term:`named tuple` ``ArgSpec(args, varargs, keywords,
@@ -478,11 +479,11 @@
.. function:: getargvalues(frame)
- Get information about arguments passed into a particular frame. A tuple of four
- things is returned: ``(args, varargs, varkw, locals)``. *args* is a list of the
- argument names (it may contain nested lists). *varargs* and *varkw* are the
- names of the ``*`` and ``**`` arguments or ``None``. *locals* is the locals
- dictionary of the given frame.
+ Get information about arguments passed into a particular frame. A tuple of
+ four things is returned: ``(args, varargs, keywords, locals)``. *args* is a
+ list of the argument names (it may contain nested lists). *varargs* and
+ *keywords* are the names of the ``*`` and ``**`` arguments or ``None``.
+ *locals* is the locals dictionary of the given frame.
.. versionchanged:: 2.6
Returns a :term:`named tuple` ``ArgInfo(args, varargs, keywords,
Modified: python/branches/release27-maint/Doc/reference/executionmodel.rst
==============================================================================
--- python/branches/release27-maint/Doc/reference/executionmodel.rst (original)
+++ python/branches/release27-maint/Doc/reference/executionmodel.rst Sun Jan 9 09:04:37 2011
@@ -140,9 +140,9 @@
The namespace for a module is automatically created the first time a module is
imported. The main module for a script is always called :mod:`__main__`.
-The global statement has the same scope as a name binding operation in the same
-block. If the nearest enclosing scope for a free variable contains a global
-statement, the free variable is treated as a global.
+The :keyword:`global` statement has the same scope as a name binding operation
+in the same block. If the nearest enclosing scope for a free variable contains
+a global statement, the free variable is treated as a global.
A class definition is an executable statement that may use and define names.
These references follow the normal rules for name resolution. The namespace of
More information about the Python-checkins
mailing list