[Python-checkins] r62392 - python/trunk/Doc/library/dis.rst

[georg.brandl]

Author: georg.brandl
Date: Sat Apr 19 18:59:16 2008
New Revision: 62392

Log:
#2631: clarify IMPORT_NAME semantics.


Modified:
   python/trunk/Doc/library/dis.rst

Modified: python/trunk/Doc/library/dis.rst
==============================================================================
--- python/trunk/Doc/library/dis.rst	(original)
+++ python/trunk/Doc/library/dis.rst	Sat Apr 19 18:59:16 2008
@@ -630,9 +630,11 @@
 
 .. opcode:: IMPORT_NAME (namei)
 
-   Imports the module ``co_names[namei]``.  The module object is pushed onto the
-   stack.  The current namespace is not affected: for a proper import statement, a
-   subsequent ``STORE_FAST`` instruction modifies the namespace.
+   Imports the module ``co_names[namei]``.  TOS and TOS1 are popped and provide
+   the *fromlist* and *level* arguments of :func:`__import__`.  The module
+   object is pushed onto the stack.  The current namespace is not affected:
+   for a proper import statement, a subsequent ``STORE_FAST`` instruction
+   modifies the namespace.
 
 
 .. opcode:: IMPORT_FROM (namei)