From 35b604db37e796d6656410165b21b3cc0ccb1ad4 Mon Sep 17 00:00:00 2001 From: Robert Bradshaw Date: Wed, 25 Mar 2009 23:22:43 -0700 Subject: [PATCH] cleanup _ERRORS --- tests/errors/break_outside_loop.pyx | 6 +++--- tests/errors/builtin_type_conflict_T170.pyx | 2 +- tests/errors/continue_outside_loop.pyx | 6 +++--- tests/errors/e_ass.pyx | 4 ++-- tests/errors/e_assnone.pyx | 2 +- tests/errors/e_badpyparam.pyx | 2 +- tests/errors/e_bitop.pyx | 2 +- tests/errors/e_boolcoerce.pyx | 4 ++-- tests/errors/e_cdef_keywords_T241.pyx | 4 ++-- tests/errors/e_cdef_missing_declarator.pyx | 2 +- tests/errors/e_cdefemptysue.pyx | 6 +++--- tests/errors/e_cenum.pyx | 2 +- tests/errors/e_cmethbasematch.pyx | 4 ++-- tests/errors/e_cmp.pyx | 4 ++-- tests/errors/e_cstruct.pyx | 16 ++++++++-------- tests/errors/e_ctypedefforward.pyx | 4 ++-- tests/errors/e_ctypedefornot.pyx | 6 +++--- tests/errors/e_declarations.pyx | 10 +++++----- tests/errors/e_del.pyx | 10 +++++----- tests/errors/e_exceptclause.pyx | 2 +- tests/errors/e_excvalfunctype.pyx | 4 ++-- tests/errors/e_extweakref.pyx | 8 ++++---- tests/errors/e_index.pyx | 8 ++++---- tests/errors/e_multass.pyx | 2 +- tests/errors/e_nargs.pyx | 10 +++++----- tests/errors/e_nogilcmeth.pyx | 4 ++-- tests/errors/e_nogilfunctype.pyx | 2 +- tests/errors/e_notnone.pyx | 2 +- tests/errors/e_notnone2.pyx | 4 ++-- tests/errors/e_numop.pyx | 2 +- tests/errors/e_pyobinstruct.pyx | 2 +- tests/errors/e_redeclmeth.pyx | 2 +- tests/errors/e_return.pyx | 6 +++--- tests/errors/e_sizeofincomplete.pyx | 2 +- tests/errors/e_slice.pyx | 6 +++--- tests/errors/e_subop.pyx | 4 ++-- tests/errors/e_tempcast.pyx | 2 +- tests/errors/e_undefexttype.pyx | 4 ++-- tests/errors/e_unop.pyx | 4 ++-- tests/errors/e_while.pyx | 4 ++-- .../errors/missing_self_in_cpdef_method_T156.pyx | 2 +- tests/errors/nogil.pyx | 6 +++--- tests/errors/nogilcmeth.pyx | 4 ++-- tests/errors/se_badindent.pyx | 2 +- tests/errors/se_badindent2.pyx | 4 ++-- tests/errors/se_conddef.pyx | 2 +- tests/errors/se_mixtabspace.pyx | 2 +- tests/errors/se_nestdef.pyx | 2 +- 48 files changed, 102 insertions(+), 102 deletions(-) diff --git a/tests/errors/break_outside_loop.pyx b/tests/errors/break_outside_loop.pyx index 81508727..07ccfeac 100644 --- 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 89d41536..b05b6280 100644 --- 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 6a2ef523..8c3a38d3 100644 --- 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 72287f7d..10b11c30 100644 --- 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 de660b32..83015cea 100644 --- 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 8e9d04fd..38b4b2bc 100644 --- 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 40d67f2e..1547c8b5 100644 --- 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 e265a020..2be2d0a7 100644 --- 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 8336b65a..179434bd 100644 --- 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 92772a6c..0b303fbe 100644 --- 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 efdf46ab..d71a8ab3 100644 --- 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 ea5298d2..142c6b05 100644 --- 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 c3c62152..b434c82a 100644 --- 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 68d238ee..6d046209 100644 --- 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 238dd216..90ab7655 100644 --- 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 6fdeb2d3..b66f21dd 100644 --- 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 14b42427..1e9491ae 100644 --- 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 cd19eb32..0e9c804d 100644 --- a/tests/errors/e_declarations.pyx +++ b/tests/errors/e_declarations.pyx @@ -8,9 +8,9 @@ cdef void f(): h = f # this is an error h = 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 b657ecdd..befed049 100644 --- 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 e6acf946..0d997f86 100644 --- 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 4147bb72..3f6b6154 100644 --- 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 1708644f..6ce4cf3c 100644 --- 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 e8ac7ee5..726d7856 100644 --- 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 b27d243a..68a552f8 100644 --- 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 7fe4d7fc..81ba78fb 100644 --- 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 6cd96217..ec596524 100644 --- 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 57c8de3f..f45b4d4a 100644 --- 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 dac45686..de6c294a 100644 --- 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 d5dead7e..60e4781f 100644 --- 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 3fbb82f6..60831cf7 100644 --- 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 f52b7978..a77ddf4a 100644 --- 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 062f4c83..0952ee03 100644 --- 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 350ffc7d..e06f76ad 100644 --- 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 9e1e77e1..3fc08583 100644 --- 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 db7e4621..6025cfa9 100644 --- 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 9ba4c5f1..90dfa72b 100644 --- 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 0a0f8b3a..7d80a121 100644 --- a/tests/errors/e_tempcast.pyx +++ b/tests/errors/e_tempcast.pyx @@ -5,5 +5,5 @@ def foo(obj): p = blarg # okay p = (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 89300a2e..23b7903a 100644 --- 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 9100d716..994f1f36 100644 --- 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 6b4bfa4c..5a5d5c19 100644 --- 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 9296ba8a..7f060e49 100644 --- 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 b6d5035e..10a9fe7e 100644 --- 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 f480da07..c7b3ce38 100644 --- 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 4376666d..01f87351 100644 --- 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 750cb9f7..a224b707 100644 --- 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 4a703ed8..62079fd1 100644 --- 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 05fe4469..c8b62102 100644 --- 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 c23c3caf..d26ed5e7 100644 --- 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 """ -- 2.26.2