Commit da1ce13d authored by memeplex's avatar memeplex

Merge branch 'master' into feat/directives

parents e7f99d9b 6664d91f
...@@ -636,7 +636,7 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations): ...@@ -636,7 +636,7 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
'operator.postincrement': ExprNodes.inc_dec_constructor(False, '++'), 'operator.postincrement': ExprNodes.inc_dec_constructor(False, '++'),
'operator.postdecrement': ExprNodes.inc_dec_constructor(False, '--'), 'operator.postdecrement': ExprNodes.inc_dec_constructor(False, '--'),
# For backwards compatability. # For backwards compatibility.
'address': ExprNodes.AmpersandNode, 'address': ExprNodes.AmpersandNode,
} }
......
# Present for backwards compatability # Present for backwards compatibility
from cpython cimport * from cpython cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.bool cimport * from cpython.bool cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.buffer cimport * from cpython.buffer cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.bytes cimport * from cpython.bytes cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.cobject cimport * from cpython.cobject cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.complex cimport * from cpython.complex cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.dict cimport * from cpython.dict cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.exc cimport * from cpython.exc cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.float cimport * from cpython.float cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.function cimport * from cpython.function cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.getargs cimport * from cpython.getargs cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.instance cimport * from cpython.instance cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.int cimport * from cpython.int cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.iterator cimport * from cpython.iterator cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.list cimport * from cpython.list cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.long cimport * from cpython.long cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.mapping cimport * from cpython.mapping cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.mem cimport * from cpython.mem cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.method cimport * from cpython.method cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.module cimport * from cpython.module cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.number cimport * from cpython.number cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.object cimport * from cpython.object cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.oldbuffer cimport * from cpython.oldbuffer cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.pycapsule cimport * from cpython.pycapsule cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.ref cimport * from cpython.ref cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.sequence cimport * from cpython.sequence cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.set cimport * from cpython.set cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.string cimport * from cpython.string cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.tuple cimport * from cpython.tuple cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.type cimport * from cpython.type cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.unicode cimport * from cpython.unicode cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.version cimport * from cpython.version cimport *
# Present for backwards compatability # Present for backwards compatibility
from cpython.weakref cimport * from cpython.weakref cimport *
# Present for backwards compatability # Present for backwards compatibility
from libc.stdio cimport * from libc.stdio cimport *
# Present for backwards compatability # Present for backwards compatibility
from libc.stdlib cimport * from libc.stdlib cimport *
...@@ -5,7 +5,7 @@ cdef extern from "Python.h": ...@@ -5,7 +5,7 @@ cdef extern from "Python.h":
cdef enum: cdef enum:
PyBUF_SIMPLE, PyBUF_SIMPLE,
PyBUF_WRITABLE, PyBUF_WRITABLE,
PyBUF_WRITEABLE, # backwards compatability PyBUF_WRITEABLE, # backwards compatibility
PyBUF_FORMAT, PyBUF_FORMAT,
PyBUF_ND, PyBUF_ND,
PyBUF_STRIDES, PyBUF_STRIDES,
......
...@@ -50,7 +50,7 @@ cdef extern from "Python.h": ...@@ -50,7 +50,7 @@ cdef extern from "Python.h":
# return value to a specific exception; use # return value to a specific exception; use
# PyErr_ExceptionMatches() instead, shown below. (The comparison # PyErr_ExceptionMatches() instead, shown below. (The comparison
# could easily fail since the exception may be an instance instead # could easily fail since the exception may be an instance instead
# of a class, in the case of a class exception, or it may the a # of a class, in the case of a class exception, or it may be a
# subclass of the expected exception.) # subclass of the expected exception.)
bint PyErr_ExceptionMatches(object exc) bint PyErr_ExceptionMatches(object exc)
......
...@@ -26,3 +26,7 @@ cdef extern from "<algorithm>" namespace "std" nogil: ...@@ -26,3 +26,7 @@ cdef extern from "<algorithm>" namespace "std" nogil:
void sort_heap[Iter](Iter first, Iter last) void sort_heap[Iter](Iter first, Iter last)
void sort_heap[Iter, Compare](Iter first, Iter last, Compare comp) void sort_heap[Iter, Compare](Iter first, Iter last, Compare comp)
# Copy
OutputIter copy[InputIter,OutputIter](InputIter,InputIter,OutputIter)
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# If any of the PyArray_* functions are called, import_array must be # If any of the PyArray_* functions are called, import_array must be
# called first. # called first.
# #
# This also defines backwards-compatability buffer acquisition # This also defines backwards-compatibility buffer acquisition
# code for use in Python 2.x (or Python <= 2.5 when NumPy starts # code for use in Python 2.x (or Python <= 2.5 when NumPy starts
# implementing PEP-3118 directly). # implementing PEP-3118 directly).
# #
......
# Note that the actual size of these types is system-dependant, and # Note that the actual size of these types is system-dependent, and
# can't be detected at C compile time. However, the generated C code # can't be detected at C compile time. However, the generated C code
# will correctly use the actual size of these types *except* for # will correctly use the actual size of these types *except* for
# determining promotion in binary arithmetic expressions involving # determining promotion in binary arithmetic expressions involving
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment