Changeset 391 for python/trunk/Doc/c-api/reflection.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/c-api/reflection.rst (modified) (7 diffs)

python/trunk/Doc/c-api/reflection.rst

@@ -6 +6 @@
 ==========
 
-.. cfunction:: PyObject* PyEval_GetBuiltins()
+.. c:function:: PyObject* PyEval_GetBuiltins()
 
    Return a dictionary of the builtins in the current execution frame,
@@ -12 +12 @@
 
 
-.. cfunction:: PyObject* PyEval_GetLocals()
+.. c:function:: PyObject* PyEval_GetLocals()
 
    Return a dictionary of the local variables in the current execution frame,
@@ -18 +18 @@
 
 
-.. cfunction:: PyObject* PyEval_GetGlobals()
+.. c:function:: PyObject* PyEval_GetGlobals()
 
    Return a dictionary of the global variables in the current execution frame,
@@ -24 +24 @@
 
 
-.. cfunction:: PyFrameObject* PyEval_GetFrame()
+.. c:function:: PyFrameObject* PyEval_GetFrame()
 
    Return the current thread state's frame, which is *NULL* if no frame is
@@ -30 +30 @@
 
 
-.. cfunction:: int PyEval_GetRestricted()
+.. c:function:: int PyFrame_GetLineNumber(PyFrameObject *frame)
+
+   Return the line number that *frame* is currently executing.
+
+
+.. c:function:: int PyEval_GetRestricted()
 
    If there is a current frame and it is executing in restricted mode, return true,
@@ -36 +41 @@
 
 
-.. cfunction:: const char* PyEval_GetFuncName(PyObject *func)
+.. c:function:: const char* PyEval_GetFuncName(PyObject *func)
 
    Return the name of *func* if it is a function, class or instance object, else the
@@ -42 +47 @@
 
 
-.. cfunction:: const char* PyEval_GetFuncDesc(PyObject *func)
+.. c:function:: const char* PyEval_GetFuncDesc(PyObject *func)
 
    Return a description string, depending on the type of *func*.
    Return values include "()" for functions and methods, " constructor",
    " instance", and " object".  Concatenated with the result of
-   :cfunc:`PyEval_GetFuncName`, the result will be a description of
+   :c:func:`PyEval_GetFuncName`, the result will be a description of
    *func*.