Ignore:
Timestamp:
Mar 19, 2014, 11:11:30 AM (11 years ago)
Author:
dmik
Message:

python: Update vendor to 2.7.6.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/vendor/current/Modules/timingmodule.c

    r2 r388  
    1111start_timing(PyObject *self)
    1212{
    13         Py_INCREF(Py_None);
    14         BEGINTIMING;
    15         return Py_None;
     13    Py_INCREF(Py_None);
     14    BEGINTIMING;
     15    return Py_None;
    1616}
    1717
     
    1919finish_timing(PyObject *self)
    2020{
    21         ENDTIMING   
    22         Py_INCREF(Py_None);
    23         return Py_None;
     21    ENDTIMING
     22    Py_INCREF(Py_None);
     23    return Py_None;
    2424}
    2525
     
    2727seconds(PyObject *self)
    2828{
    29         return PyInt_FromLong(TIMINGS);
     29    return PyInt_FromLong(TIMINGS);
    3030}
    3131
     
    3333milli(PyObject *self)
    3434{
    35         return PyInt_FromLong(TIMINGMS);
     35    return PyInt_FromLong(TIMINGMS);
    3636}
    3737
     
    3939micro(PyObject *self)
    4040{
    41         return PyInt_FromLong(TIMINGUS);
     41    return PyInt_FromLong(TIMINGUS);
    4242}
    4343
    4444
    4545static PyMethodDef timing_methods[] = {
    46         {"start",   (PyCFunction)start_timing, METH_NOARGS},
    47         {"finish",  (PyCFunction)finish_timing, METH_NOARGS},
    48         {"seconds", (PyCFunction)seconds, METH_NOARGS},
    49         {"milli",   (PyCFunction)milli, METH_NOARGS},
    50         {"micro",   (PyCFunction)micro, METH_NOARGS},
    51         {NULL,      NULL}
     46    {"start",   (PyCFunction)start_timing, METH_NOARGS},
     47    {"finish",  (PyCFunction)finish_timing, METH_NOARGS},
     48    {"seconds", (PyCFunction)seconds, METH_NOARGS},
     49    {"milli",   (PyCFunction)milli, METH_NOARGS},
     50    {"micro",   (PyCFunction)micro, METH_NOARGS},
     51    {NULL,      NULL}
    5252};
    5353
     
    5757    if (PyErr_WarnPy3k("the timing module has been removed in "
    5858                        "Python 3.0; use time.clock() instead", 2) < 0)
    59         return;
    60    
    61         (void)Py_InitModule("timing", timing_methods);
     59    return;
     60
     61    (void)Py_InitModule("timing", timing_methods);
    6262}
Note: See TracChangeset for help on using the changeset viewer.