Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/Doc/data/refcounts.dat

    r2 r391  
    5555PyBuffer_New:PyObject*::+1:
    5656PyBuffer_New:int:size::
     57
     58PyCapsule_GetContext:void *:::
     59PyCapsule_GetContext:PyObject*:self:0:
     60
     61PyCapsule_GetDestructor:void (*)(PyObject *):::
     62PyCapsule_GetDestructor:PyObject*:self:0:
     63
     64PyCapsule_GetName:const char *:::
     65PyCapsule_GetName:PyObject*:self:0:
     66
     67PyCapsule_GetPointer:void*:::
     68PyCapsule_GetPointer:PyObject*:self:0:
     69PyCapsule_GetPointer:const char *:name::
     70
     71PyCapsule_Import:void *:::
     72PyCapsule_Import:const char *:name::
     73PyCapsule_Import:int:no_block::
     74
     75PyCapsule_New:PyObject*::+1:
     76PyCapsule_New:void*:pointer::
     77PyCapsule_New:const char *:name::
     78PyCapsule_New::void (* destructor)(PyObject* )::
     79
     80PyCapsule_SetContext:int:::
     81PyCapsule_SetContext:PyObject*:self:0:
     82PyCapsule_SetContext:void *:context::
     83
     84PyCapsule_SetDestructor:int:::
     85PyCapsule_SetDestructor:PyObject*:self:0:
     86PyCapsule_SetDestructor:void (*)(PyObject *):destructor::
     87
     88PyCapsule_SetName:int:::
     89PyCapsule_SetName:PyObject*:self:0:
     90PyCapsule_SetName:const char *:name::
     91
     92PyCapsule_SetPointer:int:::
     93PyCapsule_SetPointer:PyObject*:self:0:
     94PyCapsule_SetPointer:void*:pointer::
     95
    5796
    5897PyCObject_AsVoidPtr:void*:::
     
    243282PyErr_NewException:PyObject*:dict:0:
    244283
     284PyErr_NewExceptionWithDoc:PyObject*::+1:
     285PyErr_NewExceptionWithDoc:char*:name::
     286PyErr_NewExceptionWithDoc:char*:doc::
     287PyErr_NewExceptionWithDoc:PyObject*:base:0:
     288PyErr_NewExceptionWithDoc:PyObject*:dict:0:
     289
    245290PyErr_NoMemory:PyObject*::null:
    246291
     
    451496PyImport_ExecCodeModule:PyObject*:co:0:
    452497
     498PyImport_ExecCodeModuleEx:PyObject*::+1:
     499PyImport_ExecCodeModuleEx:char*:name::
     500PyImport_ExecCodeModuleEx:PyObject*:co:0:
     501PyImport_ExecCodeModuleEx:char*:pathname::
     502
    453503PyImport_GetMagicNumber:long:::
    454504
     
    470520PyImport_ImportModuleEx:PyObject*:fromlist:0:???
    471521
     522PyImport_ImportModuleLevel:PyObject*::+1:
     523PyImport_ImportModuleLevel:char*:name::
     524PyImport_ImportModuleLevel:PyObject*:globals:0:???
     525PyImport_ImportModuleLevel:PyObject*:locals:0:???
     526PyImport_ImportModuleLevel:PyObject*:fromlist:0:???
     527PyImport_ImportModuleLevel:int:level::
     528
    472529PyImport_ReloadModule:PyObject*::+1:
    473530PyImport_ReloadModule:PyObject*:m:0:
     
    582639PyLong_AsLong:PyObject*:pylong:0:
    583640
     641PyLong_AsSsize_t:ssize_t:::
     642PyLong_AsSsize_t:PyObject*:pylong:0:
     643
    584644PyLong_AsUnsignedLong:unsigned long:::
    585645PyLong_AsUnsignedLong:PyObject*:pylong:0:
     
    599659PyLong_FromUnsignedLongLong:PyObject*::+1:
    600660PyLong_FromUnsignedLongLong:unsigned long long:v::
     661
     662PyLong_FromSize_t:PyObject*::+1:
     663PyLong_FromSize_t:size_t:v::
     664
     665PyLong_FromSsize_t:PyObject*::+1:
     666PyLong_FromSsize_t:ssize_t:v::
    601667
    602668PyLong_FromString:PyObject*::+1:
     
    841907PyNumber_Xor:PyObject*:o1:0:
    842908PyNumber_Xor:PyObject*:o2:0:
    843 
    844 PyOS_GetLastModificationTime:long:::
    845 PyOS_GetLastModificationTime:char*:filename::
    846909
    847910PyObject_AsFileDescriptor:int:::
     
    870933PyObject_CallMethodObjArgs:PyObject*::+1:
    871934PyObject_CallMethodObjArgs:PyObject*:o:0:
    872 PyObject_CallMethodObjArgs:char*:name::
     935PyObject_CallMethodObjArgs:PyObject*:name:0:
    873936PyObject_CallMethodObjArgs::...::
    874937
     
    14201483PyUnicode_FromEncodedObject:const char*:errors::
    14211484
     1485PyUnicode_FromFormat:PyObject*::+1:
     1486PyUnicode_FromFormat:const char*:format::
     1487PyUnicode_FromFormat::...::
     1488
     1489PyUnicode_FromFormatV:PyObject*::+1:
     1490PyUnicode_FromFormatV:const char*:format::
     1491PyUnicode_FromFormatV:va_list:vargs::
     1492
     1493PyUnicode_FromString:PyObject*::+1:
     1494PyUnicode_FromString:const char*:u::
     1495
     1496PyUnicode_FromStringAndSize:PyObject*::+1:
     1497PyUnicode_FromStringAndSize:const char*:u::
     1498PyUnicode_FromStringAndSize:ssize_t:size::
     1499
    14221500PyUnicode_FromWideChar:PyObject*::+1:
    14231501PyUnicode_FromWideChar:const wchar_t*:w::
     
    15961674PyUnicode_Join:PyObject*:seq:0:
    15971675
    1598 PyUnicode_Tailmatch:PyObject*::+1:
     1676PyUnicode_Tailmatch:int:::
    15991677PyUnicode_Tailmatch:PyObject*:str:0:
    16001678PyUnicode_Tailmatch:PyObject*:substr:0:
Note: See TracChangeset for help on using the changeset viewer.