Recorded merge of revisions 81029 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

  Untabify C files. Will watch buildbots.
........

1 files changed, 18 insertions, 18 deletions

diff --git a/Modules/timingmodule.c b/Modules/timingmodule.c
index 0da5c6b..a4e2c7e 100644
--- a/Modules/timingmodule.c
+++ b/Modules/timingmodule.c
@@ -10,45 +10,45 @@
 static PyObject *
 start_timing(PyObject *self)
 {
-	Py_INCREF(Py_None);
-	BEGINTIMING;
-	return Py_None;
+    Py_INCREF(Py_None);
+    BEGINTIMING;
+    return Py_None;
 }
 
 static PyObject *
 finish_timing(PyObject *self)
 {
-	ENDTIMING    
-	Py_INCREF(Py_None);
-	return Py_None;
+    ENDTIMING
+    Py_INCREF(Py_None);
+    return Py_None;
 }
 
 static PyObject *
 seconds(PyObject *self)
 {
-	return PyInt_FromLong(TIMINGS);
+    return PyInt_FromLong(TIMINGS);
 }
 
 static PyObject *
 milli(PyObject *self)
 {
-	return PyInt_FromLong(TIMINGMS);
+    return PyInt_FromLong(TIMINGMS);
 }
 
 static PyObject *
 micro(PyObject *self)
 {
-	return PyInt_FromLong(TIMINGUS);
+    return PyInt_FromLong(TIMINGUS);
 }
 
 
 static PyMethodDef timing_methods[] = {
-	{"start",   (PyCFunction)start_timing, METH_NOARGS},
-	{"finish",  (PyCFunction)finish_timing, METH_NOARGS},
-	{"seconds", (PyCFunction)seconds, METH_NOARGS},
-	{"milli",   (PyCFunction)milli, METH_NOARGS},
-	{"micro",   (PyCFunction)micro, METH_NOARGS},
-	{NULL,      NULL}
+    {"start",   (PyCFunction)start_timing, METH_NOARGS},
+    {"finish",  (PyCFunction)finish_timing, METH_NOARGS},
+    {"seconds", (PyCFunction)seconds, METH_NOARGS},
+    {"milli",   (PyCFunction)milli, METH_NOARGS},
+    {"micro",   (PyCFunction)micro, METH_NOARGS},
+    {NULL,      NULL}
 };
 
 
@@ -56,7 +56,7 @@ 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);
+    return;
+
+    (void)Py_InitModule("timing", timing_methods);
 }