summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-06 07:12:17 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-06 07:12:17 (GMT)
commit107690c2ff6ad95934b66df2d2566177b7560827 (patch)
treebed014930e5f43b142643b4c0f9b4c33543e5832 /Doc/c-api
parentc06f34fa9b089a9211151051236029e6531bd416 (diff)
downloadcpython-107690c2ff6ad95934b66df2d2566177b7560827.zip
cpython-107690c2ff6ad95934b66df2d2566177b7560827.tar.gz
cpython-107690c2ff6ad95934b66df2d2566177b7560827.tar.bz2
Merged revisions 76884-76885,76887,76889-76890,76895 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r76884 | georg.brandl | 2009-12-19 18:35:49 +0100 (Sa, 19 Dez 2009) | 9 lines Merged revisions 76883 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76883 | georg.brandl | 2009-12-19 18:34:32 +0100 (Sa, 19 Dez 2009) | 1 line #7521: remove Py_GetBuildNumber(), which was removed in favor of Py_GetBuildInfo(). ........ ................ r76885 | georg.brandl | 2009-12-19 18:36:20 +0100 (Sa, 19 Dez 2009) | 1 line #7521: remove PyEval_GetRestricted() from the docs. ................ r76887 | georg.brandl | 2009-12-19 18:46:40 +0100 (Sa, 19 Dez 2009) | 9 lines Recorded merge of revisions 76886 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76886 | georg.brandl | 2009-12-19 18:43:33 +0100 (Sa, 19 Dez 2009) | 1 line #7493: review of Design FAQ by Florent Xicluna. ........ ................ r76889 | georg.brandl | 2009-12-19 18:57:51 +0100 (Sa, 19 Dez 2009) | 1 line #7499: Review of Library FAQ by Florent Xicluna. ................ r76890 | georg.brandl | 2009-12-19 18:59:59 +0100 (Sa, 19 Dez 2009) | 1 line #7500: add "Python 3 review needed" comments and fix a few obvious errors. ................ r76895 | georg.brandl | 2009-12-19 19:23:28 +0100 (Sa, 19 Dez 2009) | 1 line #7380: Fix some str/bytearray/bytes issues in uuid docs and implementation. ................
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/init.rst7
-rw-r--r--Doc/c-api/reflection.rst6
2 files changed, 0 insertions, 13 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 1d8c38c..c694abd 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -285,13 +285,6 @@ Initialization, Finalization, and Threads
modify its value. The value is available to Python code as :data:`sys.version`.
-.. cfunction:: const char* Py_GetBuildNumber()
-
- Return a string representing the Subversion revision that this Python executable
- was built from. This number is a string because it may contain a trailing 'M'
- if Python was built from a mixed revision source tree.
-
-
.. cfunction:: const char* Py_GetPlatform()
.. index:: single: platform (in module sys)
diff --git a/Doc/c-api/reflection.rst b/Doc/c-api/reflection.rst
index 822c593..4f46c7f 100644
--- a/Doc/c-api/reflection.rst
+++ b/Doc/c-api/reflection.rst
@@ -29,12 +29,6 @@ Reflection
currently executing.
-.. cfunction:: int PyEval_GetRestricted()
-
- If there is a current frame and it is executing in restricted mode, return true,
- otherwise false.
-
-
.. cfunction:: const char* PyEval_GetFuncName(PyObject *func)
Return the name of *func* if it is a function, class or instance object, else the