cleanup _ERRORS

diff --git a/tests/errors/break_outside_loop.pyx b/tests/errors/break_outside_loop.pyx
index 81508727dbfce753252390772780e91e02bb9c4d..07ccfeace92af0cf2ca1082e960f86f3de82082f 100644 (file)
--- a/tests/errors/break_outside_loop.pyx
+++ b/tests/errors/break_outside_loop.pyx
@@ -23,9 +23,9 @@ else:
 
 
 _ERRORS = u'''
- 2:0: break statement not inside loop
- 5:4: break statement not inside loop
- 8:4: break statement not inside loop
+2:0: break statement not inside loop
+5:4: break statement not inside loop
+8:4: break statement not inside loop
 11:4: break statement not inside loop
 16:5: break statement not inside loop
 20:4: break statement not inside loop

diff --git a/tests/errors/builtin_type_conflict_T170.pyx b/tests/errors/builtin_type_conflict_T170.pyx
index 89d415361d6dcb0c28c64bb4625de303902cb458..b05b62805612711cfd45a99446737dc11688557e 100644 (file)
--- a/tests/errors/builtin_type_conflict_T170.pyx
+++ b/tests/errors/builtin_type_conflict_T170.pyx
@@ -10,6 +10,6 @@ NEW_ERRORS = u"""
 """
 
 _ERRORS = u"""
-:5:16: Cannot coerce list to type 'list'
+5:16: Cannot coerce list to type 'list'
 """
 

diff --git a/tests/errors/continue_outside_loop.pyx b/tests/errors/continue_outside_loop.pyx
index 6a2ef523abac52a0fca7199439921a06570d7ffe..8c3a38d3cb6bae3f09b7daf0f75e5b9378a50583 100644 (file)
--- a/tests/errors/continue_outside_loop.pyx
+++ b/tests/errors/continue_outside_loop.pyx
@@ -23,9 +23,9 @@ else:
 
 
 _ERRORS = u'''
- 2:0: continue statement not inside loop
- 5:4: continue statement not inside loop
- 8:4: continue statement not inside loop
+2:0: continue statement not inside loop
+5:4: continue statement not inside loop
+8:4: continue statement not inside loop
 11:4: continue statement not inside loop
 16:5: continue statement not inside loop
 20:4: continue statement not inside loop

diff --git a/tests/errors/e_ass.pyx b/tests/errors/e_ass.pyx
index 72287f7dde70a05491138dbe600fe43e94c6c963..10b11c30fc9d78fd8201a08a5906df279a39cc98 100644 (file)
--- a/tests/errors/e_ass.pyx
+++ b/tests/errors/e_ass.pyx
@@ -5,6 +5,6 @@ cdef void foo(obj):
        i1 = p1 # error
        p2 = obj # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_ass.pyx:5:16: Cannot assign type 'char *' to 'int'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_ass.pyx:6:17: Cannot convert Python object to 'int *'
+5:16: Cannot assign type 'char *' to 'int'
+6:17: Cannot convert Python object to 'int *'
 """

diff --git a/tests/errors/e_assnone.pyx b/tests/errors/e_assnone.pyx
index de660b32e3a7010a0db5daebc15eef93310c6b29..83015cea02873d97e34491a9d75313416accb8eb 100644 (file)
--- a/tests/errors/e_assnone.pyx
+++ b/tests/errors/e_assnone.pyx
@@ -1,5 +1,5 @@
 cdef void spam():
        None = 42
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_assnone.pyx:2:1: Cannot assign to or delete this
+2:1: Cannot assign to or delete this
 """

diff --git a/tests/errors/e_badpyparam.pyx b/tests/errors/e_badpyparam.pyx
index 8e9d04fd9bc0a3ab6c573e25b496d3595fcfbacb..38b4b2bc499ad9c4dacf616d8b548b55b549e32a 100644 (file)
--- a/tests/errors/e_badpyparam.pyx
+++ b/tests/errors/e_badpyparam.pyx
@@ -3,5 +3,5 @@ cdef struct Foo
 def f(Foo *p):
        pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_badpyparam.pyx:3:6: Cannot convert Python object argument to type 'Foo *'
+3:6: Cannot convert Python object argument to type 'Foo *'
 """

diff --git a/tests/errors/e_bitop.pyx b/tests/errors/e_bitop.pyx
index 40d67f2ec80f1c769c792f20fbb4c848cc625954..1547c8b577587861c3868488fb98adb6da267000 100644 (file)
--- a/tests/errors/e_bitop.pyx
+++ b/tests/errors/e_bitop.pyx
@@ -3,5 +3,5 @@ def f():
        cdef char *ptr
        int1 = int2 | ptr # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_bitop.pyx:4:13: Invalid operand types for '|' (int; char *)
+4:13: Invalid operand types for '|' (int; char *)
 """

diff --git a/tests/errors/e_boolcoerce.pyx b/tests/errors/e_boolcoerce.pyx
index e265a02081dfcec89e221257e4e3590828671268..2be2d0a790bac1bd830de0ccadad01656be04ee3 100644 (file)
--- a/tests/errors/e_boolcoerce.pyx
+++ b/tests/errors/e_boolcoerce.pyx
@@ -28,8 +28,8 @@ if union_not_boolean:
 
 
 _ERRORS = u"""
- 5:26: 'struct_type_not_boolean' is not a constant, variable or function identifier
- 5:26: Type 'struct_type_not_boolean' not acceptable as a boolean
+5:26: 'struct_type_not_boolean' is not a constant, variable or function identifier
+5:26: Type 'struct_type_not_boolean' not acceptable as a boolean
 
 12:21: 'struct_not_boolean' is not a constant, variable or function identifier
 12:21: Type 'struct_not_boolean' not acceptable as a boolean

diff --git a/tests/errors/e_cdef_keywords_T241.pyx b/tests/errors/e_cdef_keywords_T241.pyx
index 8336b65a7bbc1b1ba650f31d139800e509ba6b6a..179434bd1d7c7614b596c2c300120d24096a9a71 100644 (file)
--- a/tests/errors/e_cdef_keywords_T241.pyx
+++ b/tests/errors/e_cdef_keywords_T241.pyx
@@ -14,6 +14,6 @@ a.some_method(1, 2)
 a.some_method(1, y=2)
 
 _ERRORS = u"""
-:9:13: Keyword arguments not allowed in cdef functions.
-:14:13: Keyword arguments not allowed in cdef functions.
+9:13: Keyword arguments not allowed in cdef functions.
+14:13: Keyword arguments not allowed in cdef functions.
 """

diff --git a/tests/errors/e_cdef_missing_declarator.pyx b/tests/errors/e_cdef_missing_declarator.pyx
index 92772a6c06af8fbb82af0a7f1ac3df4e98431122..0b303fbef2a1d18da870f54276565265d98579f5 100644 (file)
--- a/tests/errors/e_cdef_missing_declarator.pyx
+++ b/tests/errors/e_cdef_missing_declarator.pyx
@@ -3,5 +3,5 @@ cdef int
 cdef extern from *:
        void f(int)
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_cdef_missing_declarator.pyx:1:8: Empty declarator
+1:8: Empty declarator
 """

diff --git a/tests/errors/e_cdefemptysue.pyx b/tests/errors/e_cdefemptysue.pyx
index efdf46ab9fa87ef80c4a7525b251301da62c9002..d71a8ab3cfc9efd82ad2302730eedae20472e7a5 100644 (file)
--- a/tests/errors/e_cdefemptysue.pyx
+++ b/tests/errors/e_cdefemptysue.pyx
@@ -7,7 +7,7 @@ ctypedef union eggs:
 cdef enum ham:
        pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cdefemptysue.pyx:1:5: Empty struct or union definition not allowed outside a 'cdef extern from' block
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cdefemptysue.pyx:4:0: Empty struct or union definition not allowed outside a 'cdef extern from' block
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cdefemptysue.pyx:7:5: Empty enum definition not allowed outside a 'cdef extern from' block
+1:5: Empty struct or union definition not allowed outside a 'cdef extern from' block
+4:0: Empty struct or union definition not allowed outside a 'cdef extern from' block
+7:5: Empty enum definition not allowed outside a 'cdef extern from' block
 """

diff --git a/tests/errors/e_cenum.pyx b/tests/errors/e_cenum.pyx
index ea5298d28328fabdb935b062a409aeb296ca865b..142c6b056c7194e013f59a85c4d1831d179f4ec4 100644 (file)
--- a/tests/errors/e_cenum.pyx
+++ b/tests/errors/e_cenum.pyx
@@ -6,5 +6,5 @@ cdef void f():
        a = 42      # assignment to non-lvalue
        
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cenum.pyx:6:3: Assignment to non-lvalue 'a'
+6:3: Assignment to non-lvalue 'a'
 """

diff --git a/tests/errors/e_cmethbasematch.pyx b/tests/errors/e_cmethbasematch.pyx
index c3c62152cc0ec6f6e7b858aad49f79e2a1df4285..b434c82a3d35d610d31f6ecd9beeea5fa996867a 100644 (file)
--- a/tests/errors/e_cmethbasematch.pyx
+++ b/tests/errors/e_cmethbasematch.pyx
@@ -6,6 +6,6 @@ cdef class D(C):
        cdef void f(self, int x):
                pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_cmethbasematch.pyx:6:6: Signature not compatible with previous declaration
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_cmethbasematch.pyx:2:6: Previous declaration is here
+6:6: Signature not compatible with previous declaration
+2:6: Previous declaration is here
 """

diff --git a/tests/errors/e_cmp.pyx b/tests/errors/e_cmp.pyx
index 68d238ee92c56c1e2b0e84ba4ea810c560851a54..6d046209fb1793cc6fef8ae53d3294535fe45586 100644 (file)
--- a/tests/errors/e_cmp.pyx
+++ b/tests/errors/e_cmp.pyx
@@ -5,6 +5,6 @@ cdef void foo():
        bool = int1 == ptr2 # error
        bool = ptr2 == ptr3 # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cmp.pyx:5:13: Invalid types for '==' (int, char *)
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cmp.pyx:6:13: Invalid types for '==' (char *, int *)
+5:13: Invalid types for '==' (int, char *)
+6:13: Invalid types for '==' (char *, int *)
 """

diff --git a/tests/errors/e_cstruct.pyx b/tests/errors/e_cstruct.pyx
index 238dd216d6d6c3645e5a31d96b59e11038c04e15..90ab76553fd97ae3875f94e9c48e420bdea1e95c 100644 (file)
--- a/tests/errors/e_cstruct.pyx
+++ b/tests/errors/e_cstruct.pyx
@@ -20,12 +20,12 @@ cdef void eggs(Spam s):
        j = gp.x # error - incomplete type
        gp.x = j # error - incomplete type
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:5:36: C struct/union member cannot be a Python object
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:15:6: Object of type 'Spam' has no attribute 'k'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:16:6: Cannot assign type 'float *[42]' to 'int'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:17:21: Cannot assign type 'int' to 'float *[42]'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:18:6: Object of type 'int' has no attribute 'i'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:19:2: Object of type 'int' has no attribute 'i'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:20:7: Cannot select attribute of incomplete type 'Grail'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_cstruct.pyx:21:3: Cannot select attribute of incomplete type 'Grail'
+5:36: C struct/union member cannot be a Python object
+15:6: Object of type 'Spam' has no attribute 'k'
+16:6: Cannot assign type 'float *[42]' to 'int'
+17:21: Cannot assign type 'int' to 'float *[42]'
+18:6: Object of type 'int' has no attribute 'i'
+19:2: Object of type 'int' has no attribute 'i'
+20:7: Cannot select attribute of incomplete type 'Grail'
+21:3: Cannot select attribute of incomplete type 'Grail'
 """

diff --git a/tests/errors/e_ctypedefforward.pyx b/tests/errors/e_ctypedefforward.pyx
index 6fdeb2d3a1b1d2996b0a60b9eb6aedf231b992e7..b66f21dd4a7c8022bc557241ab60ecd788cb660e 100644 (file)
--- a/tests/errors/e_ctypedefforward.pyx
+++ b/tests/errors/e_ctypedefforward.pyx
@@ -13,6 +13,6 @@ ctypedef class Eggs:
 ctypedef struct Spam
 ctypedef class Eggs
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_ctypedefforward.pyx:1:0: Forward-referenced type must use 'cdef', not 'ctypedef'
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_ctypedefforward.pyx:2:0: Forward-referenced type must use 'cdef', not 'ctypedef'
+1:0: Forward-referenced type must use 'cdef', not 'ctypedef'
+2:0: Forward-referenced type must use 'cdef', not 'ctypedef'
 """

diff --git a/tests/errors/e_ctypedefornot.pyx b/tests/errors/e_ctypedefornot.pyx
index 14b424279088fbf0344d60714408f2af807abb1a..1e9491ae074f357527b9095f03c788c328ff7e50 100644 (file)
--- a/tests/errors/e_ctypedefornot.pyx
+++ b/tests/errors/e_ctypedefornot.pyx
@@ -17,7 +17,7 @@ cdef Foo f
 cdef Blarg b
 
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_ctypedefornot.pyx:3:0: 'Foo' previously declared using 'cdef'
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_ctypedefornot.pyx:9:5: 'Blarg' previously declared using 'ctypedef'
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_ctypedefornot.pyx:13:0: 'Spam' previously declared using 'cdef'
+3:0: 'Foo' previously declared using 'cdef'
+9:5: 'Blarg' previously declared using 'ctypedef'
+13:0: 'Spam' previously declared using 'cdef'
 """

diff --git a/tests/errors/e_declarations.pyx b/tests/errors/e_declarations.pyx
index cd19eb3297a4bf23c64a3fc46ac27c6d0250058e..0e9c804d35f342141c20ad2036970f4dd9a16af9 100644 (file)
--- a/tests/errors/e_declarations.pyx
+++ b/tests/errors/e_declarations.pyx
@@ -8,9 +8,9 @@ cdef void f():
        h = <int ()()>f # this is an error
        h = <int (*)()>f # this is OK
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_declarations.pyx:1:19: Array element cannot be a function
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_declarations.pyx:2:18: Function cannot return an array
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_declarations.pyx:3:18: Function cannot return a function
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_declarations.pyx:8:10: Function cannot return a function
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_declarations.pyx:8:5: Cannot cast to a function type
+1:19: Array element cannot be a function
+2:18: Function cannot return an array
+3:18: Function cannot return a function
+8:10: Function cannot return a function
+8:5: Cannot cast to a function type
 """

diff --git a/tests/errors/e_del.pyx b/tests/errors/e_del.pyx
index b657ecdd70696174499ada14f188a1ffb29798bd..befed049bb1b26c761988ab6ec0c080da2b77ce8 100644 (file)
--- a/tests/errors/e_del.pyx
+++ b/tests/errors/e_del.pyx
@@ -12,9 +12,9 @@ def f(a):
        del x[i] # error: deletion of non-Python object
        del s.m # error: deletion of non-Python object
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_del.pyx:8:6: Cannot assign to or delete this
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_del.pyx:9:45: Deletion of non-Python object
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_del.pyx:12:6: Deletion of non-Python object
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_del.pyx:13:6: Deletion of non-Python object
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_del.pyx:11:52: Deletion of local or C global name not supported
+8:6: Cannot assign to or delete this
+9:45: Deletion of non-Python object
+12:6: Deletion of non-Python object
+13:6: Deletion of non-Python object
+11:52: Deletion of local or C global name not supported
 """

diff --git a/tests/errors/e_exceptclause.pyx b/tests/errors/e_exceptclause.pyx
index e6acf946afdb16333621f25c0ee8aa436a00ccde..0d997f866be1a994f2c9ff9ad499de396f60d858 100644 (file)
--- a/tests/errors/e_exceptclause.pyx
+++ b/tests/errors/e_exceptclause.pyx
@@ -11,6 +11,6 @@ except AttributeError:
     pass
 
 _ERRORS = u"""
- 8:0: default 'except:' must be last
+8:0: default 'except:' must be last
 10:0: default 'except:' must be last
 """

diff --git a/tests/errors/e_excvalfunctype.pyx b/tests/errors/e_excvalfunctype.pyx
index 4147bb72eeca224b2a78693564d2efa0e1b54be2..3f6b6154dd7b17c2d8ceb7b61f766b0244c5fbec 100644 (file)
--- a/tests/errors/e_excvalfunctype.pyx
+++ b/tests/errors/e_excvalfunctype.pyx
@@ -7,6 +7,6 @@ cdef spamfunc spam
 grail = spam # type mismatch
 spam = grail # type mismatch
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_excvalfunctype.pyx:7:28: Cannot assign type 'e_excvalfunctype.spamfunc' to 'e_excvalfunctype.grailfunc'
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_excvalfunctype.pyx:8:28: Cannot assign type 'e_excvalfunctype.grailfunc' to 'e_excvalfunctype.spamfunc'
+7:28: Cannot assign type 'e_excvalfunctype.spamfunc' to 'e_excvalfunctype.grailfunc'
+8:28: Cannot assign type 'e_excvalfunctype.grailfunc' to 'e_excvalfunctype.spamfunc'
 """

diff --git a/tests/errors/e_extweakref.pyx b/tests/errors/e_extweakref.pyx
index 1708644fac2e501ff24fdd07d17a906e670503d9..6ce4cf3c3cf1e72ce0274a90efd0383e2fef992c 100644 (file)
--- a/tests/errors/e_extweakref.pyx
+++ b/tests/errors/e_extweakref.pyx
@@ -13,8 +13,8 @@ cdef void f():
        x = c.__weakref__
        c.__weakref__ = x
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_extweakref.pyx:5:20: Special attribute __weakref__ cannot be exposed to Python
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_extweakref.pyx:8:22: Special attribute __weakref__ cannot be exposed to Python
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_extweakref.pyx:13:6: Illegal use of special attribute __weakref__
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_extweakref.pyx:14:2: Illegal use of special attribute __weakref__
+5:20: Special attribute __weakref__ cannot be exposed to Python
+8:22: Special attribute __weakref__ cannot be exposed to Python
+13:6: Illegal use of special attribute __weakref__
+14:2: Illegal use of special attribute __weakref__
 """

diff --git a/tests/errors/e_index.pyx b/tests/errors/e_index.pyx
index e8ac7ee5d8c2b01b540097ce16131f10eb8083ab..726d78567872b4da5ac2dda3ee4b9b2743312b9f 100644 (file)
--- a/tests/errors/e_index.pyx
+++ b/tests/errors/e_index.pyx
@@ -7,8 +7,8 @@ def f(obj1, obj2):
        int1 = int2[int3] # error
        obj1 = obj2[ptr1] # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_index.pyx:5:14: Invalid index type 'float'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_index.pyx:6:14: Invalid index type 'float *'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_index.pyx:7:12: Attempting to index non-array type 'int'
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_index.pyx:8:17: Cannot convert 'float *' to Python object
+5:14: Invalid index type 'float'
+6:14: Invalid index type 'float *'
+7:12: Attempting to index non-array type 'int'
+8:17: Cannot convert 'float *' to Python object
 """

diff --git a/tests/errors/e_multass.pyx b/tests/errors/e_multass.pyx
index b27d243a6a16ef2b159697cff1ee9d6c6bac7a72..68a552f89e11468520a14df758377547ffb7e518 100644 (file)
--- a/tests/errors/e_multass.pyx
+++ b/tests/errors/e_multass.pyx
@@ -3,5 +3,5 @@ def f(obj1a, obj1b):
        cdef int *ptr2
        int1, int3, obj1a = int2, ptr2, obj1b # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_multass.pyx:4:31: Cannot assign type 'int *' to 'int'
+4:31: Cannot assign type 'int *' to 'int'
 """

diff --git a/tests/errors/e_nargs.pyx b/tests/errors/e_nargs.pyx
index 7fe4d7fccb6538532d675b2b5407fbff4a570f4b..81ba78fbacc19a1b255ee1a7048297df6ea419fc 100644 (file)
--- a/tests/errors/e_nargs.pyx
+++ b/tests/errors/e_nargs.pyx
@@ -8,9 +8,9 @@ cdef f():
        spam() # too few args
        spam("blarg") # too few args
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_nargs.pyx:5:6: Call with wrong number of arguments (expected 2, got 0)
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_nargs.pyx:6:6: Call with wrong number of arguments (expected 2, got 1)
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_nargs.pyx:7:6: Call with wrong number of arguments (expected 2, got 3)
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_nargs.pyx:8:5: Call with wrong number of arguments (expected at least 2, got 0)
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_nargs.pyx:9:5: Call with wrong number of arguments (expected at least 2, got 1)
+5:6: Call with wrong number of arguments (expected 2, got 0)
+6:6: Call with wrong number of arguments (expected 2, got 1)
+7:6: Call with wrong number of arguments (expected 2, got 3)
+8:5: Call with wrong number of arguments (expected at least 2, got 0)
+9:5: Call with wrong number of arguments (expected at least 2, got 1)
 """

diff --git a/tests/errors/e_nogilcmeth.pyx b/tests/errors/e_nogilcmeth.pyx
index 6cd962175ca1c8dc4bb34faeea3cc224f00e1134..ec596524dd26cbb2329d65ac76b4f3d06753f2b7 100644 (file)
--- a/tests/errors/e_nogilcmeth.pyx
+++ b/tests/errors/e_nogilcmeth.pyx
@@ -3,6 +3,6 @@ cdef class C:
                pass
 
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_nogilcmeth.pyx:2:6: Signature not compatible with previous declaration
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_nogilcmeth.pxd:2:12: Previous declaration is here
+2:6: Signature not compatible with previous declaration
+2:12: Previous declaration is here
 """

diff --git a/tests/errors/e_nogilfunctype.pyx b/tests/errors/e_nogilfunctype.pyx
index 57c8de3fa55f8faad3621cda49b5674f1931f7e9..f45b4d4a7b793d4d0d296d5a0c5960ccb818d4b4 100644 (file)
--- a/tests/errors/e_nogilfunctype.pyx
+++ b/tests/errors/e_nogilfunctype.pyx
@@ -4,5 +4,5 @@ cdef extern from *:
 
 fp = f
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors3/e_nogilfunctype.pyx:5:6: Cannot assign type 'void (void)' to 'void (*)(void) nogil'
+5:6: Cannot assign type 'void (void)' to 'void (*)(void) nogil'
 """

diff --git a/tests/errors/e_notnone.pyx b/tests/errors/e_notnone.pyx
index dac456868063779fb79ffb963115f2e086cf16ea..de6c294a3d055bd7b6f56dea3ea27d1a3748424b 100644 (file)
--- a/tests/errors/e_notnone.pyx
+++ b/tests/errors/e_notnone.pyx
@@ -3,5 +3,5 @@ cdef extern class Grail.Shrubbery
 cdef void spam(Shrubbery sh not None):
        pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_notnone.pyx:3:15: 'not None' only allowed in Python functions
+3:15: 'not None' only allowed in Python functions
 """

diff --git a/tests/errors/e_notnone2.pyx b/tests/errors/e_notnone2.pyx
index d5dead7ee22976b44d43b88d1b032cf655ba1b3f..60e4781f9020a8c804302df23aec9f83650a7588 100644 (file)
--- a/tests/errors/e_notnone2.pyx
+++ b/tests/errors/e_notnone2.pyx
@@ -1,6 +1,6 @@
 def eggs(int x not None, y not None):
        pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_notnone2.pyx:1:0: Only extension type arguments can have 'not None'
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_notnone2.pyx:1:0: Only extension type arguments can have 'not None'
+1:0: Only extension type arguments can have 'not None'
+1:0: Only extension type arguments can have 'not None'
 """

diff --git a/tests/errors/e_numop.pyx b/tests/errors/e_numop.pyx
index 3fbb82f67d4396cc0bb96a3183280fcbca10c2d3..60831cf7e36974c4e16ca9fd8b6ba8f91bac1cb4 100644 (file)
--- a/tests/errors/e_numop.pyx
+++ b/tests/errors/e_numop.pyx
@@ -3,5 +3,5 @@ def f():
        cdef int *ptr
        int1 = int2 * ptr # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_numop.pyx:4:13: Invalid operand types for '*' (int; int *)
+4:13: Invalid operand types for '*' (int; int *)
 """

diff --git a/tests/errors/e_pyobinstruct.pyx b/tests/errors/e_pyobinstruct.pyx
index f52b79782fe4e7bdfd2579e7a67b94d80793425b..a77ddf4ab597533776367252b5c8f323e120aed8 100644 (file)
--- a/tests/errors/e_pyobinstruct.pyx
+++ b/tests/errors/e_pyobinstruct.pyx
@@ -7,5 +7,5 @@ def f():
        cdef spam s
        s.parrot = x
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_pyobinstruct.pyx:4:8: C struct/union member cannot be a Python object
+4:8: C struct/union member cannot be a Python object
 """

diff --git a/tests/errors/e_redeclmeth.pyx b/tests/errors/e_redeclmeth.pyx
index 062f4c83fce851fd2ab2a064c2c38d859a36caf3..0952ee03b36612a6d3aea8028e9a88b64ce1fd1c 100644 (file)
--- a/tests/errors/e_redeclmeth.pyx
+++ b/tests/errors/e_redeclmeth.pyx
@@ -4,5 +4,5 @@ class C:
        def f(self):
                pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_redeclmeth.pyx:4:1: 'f' already declared
+4:1: 'f' already declared
 """

diff --git a/tests/errors/e_return.pyx b/tests/errors/e_return.pyx
index 350ffc7d048759f436296e9a0e43a50c2a636484..e06f76ad891ab49d0094ec5a44fa4fb2dfc745d1 100644 (file)
--- a/tests/errors/e_return.pyx
+++ b/tests/errors/e_return.pyx
@@ -7,7 +7,7 @@ cdef int h():
        return # error
        return p # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_return.pyx:3:17: Return with value in void function
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_return.pyx:7:1: Return value required
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_return.pyx:8:17: Cannot assign type 'int *' to 'int'
+3:17: Return with value in void function
+7:1: Return value required
+8:17: Cannot assign type 'int *' to 'int'
 """

diff --git a/tests/errors/e_sizeofincomplete.pyx b/tests/errors/e_sizeofincomplete.pyx
index 9e1e77e14a496720167f4b56fe09b28be0d6d252..3fc08583aeb3c619e8c71417d69b4ff6642f5b71 100644 (file)
--- a/tests/errors/e_sizeofincomplete.pyx
+++ b/tests/errors/e_sizeofincomplete.pyx
@@ -2,5 +2,5 @@ cdef struct unbekannt
 cdef int n
 n = sizeof(unbekannt)
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_sizeofincomplete.pyx:3:4: Cannot take sizeof incomplete type 'unbekannt'
+3:4: Cannot take sizeof incomplete type 'unbekannt'
 """

diff --git a/tests/errors/e_slice.pyx b/tests/errors/e_slice.pyx
index db7e46218f7ceccbb8817612d821d641a34204d5..6025cfa987aaead0eb362ff191faf42a2d72b4d1 100644 (file)
--- a/tests/errors/e_slice.pyx
+++ b/tests/errors/e_slice.pyx
@@ -4,7 +4,7 @@ def f(obj2):
        obj1 = obj2[:ptr1:] # error
        obj1 = obj2[::ptr1] # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_slice.pyx:3:17: Cannot convert 'int *' to Python object
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_slice.pyx:4:18: Cannot convert 'int *' to Python object
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_slice.pyx:5:19: Cannot convert 'int *' to Python object
+3:17: Cannot convert 'int *' to Python object
+4:18: Cannot convert 'int *' to Python object
+5:19: Cannot convert 'int *' to Python object
 """

diff --git a/tests/errors/e_subop.pyx b/tests/errors/e_subop.pyx
index 9ba4c5f19c3e3724504ae0151735f189d11de438..90dfa72bc1c5dfe3f425b45835724c86f41a6ed5 100644 (file)
--- a/tests/errors/e_subop.pyx
+++ b/tests/errors/e_subop.pyx
@@ -4,6 +4,6 @@ def f():
        ptr1 = int2 - ptr3 # error
        ptr1 = ptr2 - ptr3 # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_subop.pyx:4:13: Invalid operand types for '-' (int; char *)
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_subop.pyx:5:13: Cannot assign type 'int' to 'char *'
+4:13: Invalid operand types for '-' (int; char *)
+5:13: Cannot assign type 'int' to 'char *'
 """

diff --git a/tests/errors/e_tempcast.pyx b/tests/errors/e_tempcast.pyx
index 0a0f8b3abb4a1d2e7a19cd2bd823f7a6a5024bb6..7d80a1212220b850ff7f10aecd25da57902e6aca 100644 (file)
--- a/tests/errors/e_tempcast.pyx
+++ b/tests/errors/e_tempcast.pyx
@@ -5,5 +5,5 @@ def foo(obj):
        p = <int *>blarg # okay
        p = <int *>(foo + blarg) # error - temporary
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_tempcast.pyx:6:5: Casting temporary Python object to non-numeric non-Python type
+6:5: Casting temporary Python object to non-numeric non-Python type
 """

diff --git a/tests/errors/e_undefexttype.pyx b/tests/errors/e_undefexttype.pyx
index 89300a2e5a68dad6d397fbc510dccb4a0edcc507..23b7903a999dbef9b2e18c4afd6de9713be513bd 100644 (file)
--- a/tests/errors/e_undefexttype.pyx
+++ b/tests/errors/e_undefexttype.pyx
@@ -1,6 +1,6 @@
 cdef class Spam
 cdef extern class external.Eggs
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_undefexttype.pyx:1:5: C class 'Spam' is declared but not defined
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/e_undefexttype.pyx:2:5: C class 'Eggs' is declared but not defined
+1:5: C class 'Spam' is declared but not defined
+2:5: C class 'Eggs' is declared but not defined
 """

diff --git a/tests/errors/e_unop.pyx b/tests/errors/e_unop.pyx
index 9100d716c5c66b1979349130f5ca9ed3925f22a9..994f1f36e61d0f239dff9bdc13cc02b5bf76961e 100644 (file)
--- a/tests/errors/e_unop.pyx
+++ b/tests/errors/e_unop.pyx
@@ -4,6 +4,6 @@ def f():
        int1 = -str2 # error
        int1 = ~str2 # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_unop.pyx:4:8: Invalid operand type for '-' (char *)
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_unop.pyx:5:8: Invalid operand type for '~' (char *)
+4:8: Invalid operand type for '-' (char *)
+5:8: Invalid operand type for '~' (char *)
 """

diff --git a/tests/errors/e_while.pyx b/tests/errors/e_while.pyx
index 6b4bfa4c19fa169bbdb98f2395c6a2dd6331ce26..5a5d5c19fb5672bcf92c9d879b25164d319d8c90 100644 (file)
--- a/tests/errors/e_while.pyx
+++ b/tests/errors/e_while.pyx
@@ -3,6 +3,6 @@ def f(a, b):
        break # error
        continue # error
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_while.pyx:3:1: break statement not inside loop
-/Local/Projects/D/Pyrex/Source/Tests/Errors2/e_while.pyx:4:1: continue statement not inside loop
+3:1: break statement not inside loop
+4:1: continue statement not inside loop
 """

diff --git a/tests/errors/missing_self_in_cpdef_method_T156.pyx b/tests/errors/missing_self_in_cpdef_method_T156.pyx
index 9296ba8a21c987eca3cc43f886166bc195624fae..7f060e49a7562cb52189e8982992d5d689d57801 100644 (file)
--- a/tests/errors/missing_self_in_cpdef_method_T156.pyx
+++ b/tests/errors/missing_self_in_cpdef_method_T156.pyx
@@ -4,5 +4,5 @@ cdef class B:
         pass
 
 _ERRORS = u"""
-:3:10: C method has no self argument
+3:10: C method has no self argument
 """

diff --git a/tests/errors/nogil.pyx b/tests/errors/nogil.pyx
index b6d5035e663bf65558516f3000189c9414930ed0..10a9fe7e72b4bcf607926928d8532485f77dbaac 100644 (file)
--- a/tests/errors/nogil.pyx
+++ b/tests/errors/nogil.pyx
@@ -78,9 +78,9 @@ cdef void t(C c) nogil:
 
 
 _ERRORS = u"""
- 1: 5: Function with Python return type cannot be declared nogil
- 6: 6: Assignment of Python object not allowed without gil
- 4: 5: Function declared nogil has Python locals or temporaries
+1: 5: Function with Python return type cannot be declared nogil
+6: 6: Assignment of Python object not allowed without gil
+4: 5: Function declared nogil has Python locals or temporaries
 11: 5: Function with Python return type cannot be declared nogil
 15: 5: Calling gil-requiring function without gil
 24: 9: Calling gil-requiring function without gil

diff --git a/tests/errors/nogilcmeth.pyx b/tests/errors/nogilcmeth.pyx
index f480da07331efe1840e91d3ae9e355c83886ad1b..c7b3ce382595532bb995bf1561a236d692c99f4f 100644 (file)
--- a/tests/errors/nogilcmeth.pyx
+++ b/tests/errors/nogilcmeth.pyx
@@ -3,6 +3,6 @@ cdef class C:
         pass
 
 _ERRORS = u"""
-nogilcmeth.pyx:2:9: Signature not compatible with previous declaration
-nogilcmeth.pxd:2:15: Previous declaration is here
+2:9: Signature not compatible with previous declaration
+2:15: Previous declaration is here
 """

diff --git a/tests/errors/se_badindent.pyx b/tests/errors/se_badindent.pyx
index 4376666daf05c849327ee299dbefc49aaaae52a9..01f87351773e0a32dd09a6e24f5da20eba6c5ce1 100644 (file)
--- a/tests/errors/se_badindent.pyx
+++ b/tests/errors/se_badindent.pyx
@@ -2,5 +2,5 @@ def f():
   a = b # space space
        c = d # space tab
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/se_badindent.pyx:3:0: Mixed use of tabs and spaces
+3:0: Mixed use of tabs and spaces
 """

diff --git a/tests/errors/se_badindent2.pyx b/tests/errors/se_badindent2.pyx
index 750cb9f715f122c671d2c2b8c1cffae8fe843098..a224b707a650dcfd6b2aca28a4abe6096e00f073 100644 (file)
--- a/tests/errors/se_badindent2.pyx
+++ b/tests/errors/se_badindent2.pyx
@@ -2,6 +2,6 @@ def f():
        a = b
                c = d
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/se_badindent2.pyx:3:0: Possible inconsistent indentation
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/se_badindent2.pyx:3:0: Expected an identifier or literal
+3:0: Possible inconsistent indentation
+3:0: Expected an identifier or literal
 """

diff --git a/tests/errors/se_conddef.pyx b/tests/errors/se_conddef.pyx
index 4a703ed8b2623196c1164db4bd1bec049b9b89cb..62079fd121c766bfdcfbbc5a8edd60b059afe07e 100644 (file)
--- a/tests/errors/se_conddef.pyx
+++ b/tests/errors/se_conddef.pyx
@@ -2,5 +2,5 @@ if x:
        def h():
                pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/se_conddef.pyx:2:1: def statement not allowed here
+2:1: def statement not allowed here
 """

diff --git a/tests/errors/se_mixtabspace.pyx b/tests/errors/se_mixtabspace.pyx
index 05fe4469d737e46ece1fd48bc8c81dc0a015a98f..c8b62102146634b9ed78a2b85741536e9da1f26b 100644 (file)
--- a/tests/errors/se_mixtabspace.pyx
+++ b/tests/errors/se_mixtabspace.pyx
@@ -2,5 +2,5 @@ def f():
  a = b # space space
        c = d # tab
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/se_mixtabspace.pyx:3:0: Mixed use of tabs and spaces
+3:0: Mixed use of tabs and spaces
 """

diff --git a/tests/errors/se_nestdef.pyx b/tests/errors/se_nestdef.pyx
index c23c3caf9cc12330f1b92ef7cacec757a9a4c50e..d26ed5e7b2d3485d3d0f58cca1da4e9cc1e4497d 100644 (file)
--- a/tests/errors/se_nestdef.pyx
+++ b/tests/errors/se_nestdef.pyx
@@ -2,5 +2,5 @@ def f():
        def g():
                pass
 _ERRORS = u"""
-/Local/Projects/D/Pyrex/Source/Tests/Errors1/se_nestdef.pyx:2:1: def statement not allowed here
+2:1: def statement not allowed here
 """