summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-05-12 03:47:47 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-05-12 03:47:47 (GMT)
commitbb141bb1f4ece144f681739279dba266f5e64a9d (patch)
tree1be831a831b6ca92ff8febf3a761e75227d75b8d
parentac861b5a172a389f7d062fee6d88ded17e458b2e (diff)
downloadcpython-bb141bb1f4ece144f681739279dba266f5e64a9d.zip
cpython-bb141bb1f4ece144f681739279dba266f5e64a9d.tar.gz
cpython-bb141bb1f4ece144f681739279dba266f5e64a9d.tar.bz2
Deprecate the timing module for removal in Python 3.0.
-rw-r--r--Doc/library/undoc.rst2
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/timingmodule.c4
3 files changed, 8 insertions, 0 deletions
diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index 981b0ce..9875a07 100644
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -213,6 +213,8 @@ extensions.
:mod:`timing`
--- Measure time intervals to high resolution (use :func:`time.clock` instead).
+
+ .. warning:: The :mod:`timing` module has been removed in Python 3.0.
SGI-specific Extension modules
diff --git a/Misc/NEWS b/Misc/NEWS
index 4065c8b..0647833 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@ Extension Modules
Library
-------
+- The timing module has been deprecated for removal in Python 3.0.
+
- The sv module has been deprecated for removal in Python 3.0.
- The multifile module has been deprecated as per PEP 4.
diff --git a/Modules/timingmodule.c b/Modules/timingmodule.c
index 56e057a..0da5c6b 100644
--- a/Modules/timingmodule.c
+++ b/Modules/timingmodule.c
@@ -54,5 +54,9 @@ static PyMethodDef timing_methods[] = {
PyMODINIT_FUNC inittiming(void)
{
+ if (PyErr_WarnPy3k("the timing module has been removed in "
+ "Python 3.0; use time.clock() instead", 2) < 0)
+ return;
+
(void)Py_InitModule("timing", timing_methods);
}