traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hand-port parts of r87789.

This commit is contained in:
Georg Brandl 2011-01-09 08:04:37 +00:00
parent c40e921d62
commit cbb2e49c3c
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Doc/library/inspect.rst
View File

@ -234,14 +234,14 @@ Note:
Return a tuple of values that describe how Python will interpret the file 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 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)``, identified as a module. The return tuple is ``(name, suffix, mode,
where *name* is the name of the module without the name of any enclosing module_type)``, where *name* is the name of the module without the name of
package, *suffix* is the trailing part of the file name (which may not be a any enclosing package, *suffix* is the trailing part of the file name (which
dot-delimited extension), *mode* is the :func:`open` mode that would be used may not be a dot-delimited extension), *mode* is the :func:`open` mode that
(``'r'`` or ``'rb'``), and *mtype* is an integer giving the type of the would be used (``'r'`` or ``'rb'``), and *module_type* is an integer giving
module. *mtype* will have a value which can be compared to the constants the type of the module. *module_type* will have a value which can be
defined in the :mod:`imp` module; see the documentation for that module for compared to the constants defined in the :mod:`imp` module; see the
more information on module types. documentation for that module for more information on module types.
.. versionchanged:: 2.6 .. versionchanged:: 2.6
Returns a :term:`named tuple` ``ModuleInfo(name, suffix, mode, Returns a :term:`named tuple` ``ModuleInfo(name, suffix, mode,
@ -464,12 +464,13 @@ Classes and functions
.. function:: getargspec(func) .. function:: getargspec(func)
Get the names and default values of a Python function's arguments. A tuple of four Get the names and default values of a Python function's arguments. A tuple of
things is returned: ``(args, varargs, varkw, defaults)``. *args* is a list of four things is returned: ``(args, varargs, keywords, defaults)``. *args* is a
the argument names (it may contain nested lists). *varargs* and *varkw* are the list of the argument names (it may contain nested lists). *varargs* and
names of the ``*`` and ``**`` arguments or ``None``. *defaults* is a tuple of *keywords* are the names of the ``*`` and ``**`` arguments or
default argument values or None if there are no default arguments; if this tuple ``None``. *defaults* is a tuple of default argument values or None if there
has *n* elements, they correspond to the last *n* elements listed in *args*. are no default arguments; if this tuple has *n* elements, they correspond to
the last *n* elements listed in *args*.
.. versionchanged:: 2.6 .. versionchanged:: 2.6
Returns a :term:`named tuple` ``ArgSpec(args, varargs, keywords, Returns a :term:`named tuple` ``ArgSpec(args, varargs, keywords,
@ -478,11 +479,11 @@ Classes and functions
.. function:: getargvalues(frame) .. function:: getargvalues(frame)
Get information about arguments passed into a particular frame. A tuple of four Get information about arguments passed into a particular frame. A tuple of
things is returned: ``(args, varargs, varkw, locals)``. *args* is a list of the four things is returned: ``(args, varargs, keywords, locals)``. *args* is a
argument names (it may contain nested lists). *varargs* and *varkw* are the list of the argument names (it may contain nested lists). *varargs* and
names of the ``*`` and ``**`` arguments or ``None``. *locals* is the locals *keywords* are the names of the ``*`` and ``**`` arguments or ``None``.
dictionary of the given frame. *locals* is the locals dictionary of the given frame.
.. versionchanged:: 2.6 .. versionchanged:: 2.6
Returns a :term:`named tuple` ``ArgInfo(args, varargs, keywords, Returns a :term:`named tuple` ``ArgInfo(args, varargs, keywords,

6
Doc/reference/executionmodel.rst
View File

@ -140,9 +140,9 @@ weak form of restricted execution.
The namespace for a module is automatically created the first time a module is 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__`. 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 The :keyword:`global` statement has the same scope as a name binding operation
block. If the nearest enclosing scope for a free variable contains a global in the same block. If the nearest enclosing scope for a free variable contains
statement, the free variable is treated as a global. a global statement, the free variable is treated as a global.
A class definition is an executable statement that may use and define names. 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 These references follow the normal rules for name resolution. The namespace of