Patches to make Windows port work with Python 2.6a3

Cython/Compiler/Errors.py:
    Needed the self.message removed because of deprecation in BaseException.

tests/compile/food.h:
    Converted line endings from Mac to Unix since VS2008 compiler
    fails with Mac text files.

tests/compile/belchenko1.pyx:
    Changed cdef extern to eliminate math.h since it doesn't exist on Windoze.
    This needs to be reviewed since it isn't clear if the test
    needs to build the lib with math.h or whether it is just
    testing the compiler (which wouldn't read math.h anyway).

diff --git a/Cython/Compiler/Errors.py b/Cython/Compiler/Errors.py
index 4c9e7981cf23026835643590798288885c3c2c1f..84a69deebdbdc0fdda58f6a511a4d2b190ea7a66 100644 (file)
--- a/Cython/Compiler/Errors.py
+++ b/Cython/Compiler/Errors.py
@@ -27,7 +27,8 @@ class CompileError(PyrexError):
     
     def __init__(self, position = None, message = ""):
         self.position = position
-        self.message = message
+    # Deprecated and withdrawn in 2.6:
+    #   self.message = message
         if position:
             pos_str = "%s:%d:%d: " % (position[0].get_description(), position[1], position[2])
             cont = context(position)
@@ -40,7 +41,8 @@ class CompileWarning(PyrexWarning):
     
     def __init__(self, position = None, message = ""):
         self.position = position
-        self.message = message
+    # Deprecated and withdrawn in 2.6:
+    #   self.message = message
         if position:
             pos_str = "%s:%d:%d: " % (position[0].get_description(), position[1], position[2])
         else:

diff --git a/tests/compile/belchenko1.pyx b/tests/compile/belchenko1.pyx
index bae543a1bc0dc1908eb6fca1a0fb4d1062dc0c72..d6905f864989548e8ada5c7c24483d198a390c5d 100644 (file)
--- a/tests/compile/belchenko1.pyx
+++ b/tests/compile/belchenko1.pyx
@@ -1,4 +1,4 @@
-cdef extern from "stdint.h":
+cdef extern from *:
     ctypedef int intptr_t
 
 cdef int _is_aligned(void *ptr):

diff --git a/tests/compile/food.h b/tests/compile/food.h
index 00af7f478e294640d0de80fdb77becc8a8afae54..9103c10bc0aa6092a00b39185068ca0bb5ea1b73 100644 (file)
--- a/tests/compile/food.h
+++ b/tests/compile/food.h
@@ -1 +1,8 @@
-struct Tomato {\r       PyObject_HEAD\r};\r\rstruct Bicycle{\r      PyObject_HEAD\r};\r
\ No newline at end of file
+struct Tomato {\r
+       PyObject_HEAD\r
+};\r
+\r
+struct Bicycle{\r
+       PyObject_HEAD\r
+};\r
+\r