safety fixes for tests under type inference

diff --git a/tests/compile/extcoerce.pyx b/tests/compile/extcoerce.pyx
index 374238e08f584b55047aede6f01a186a54317dd1..7a850b602720c87ac098df0974ded2f8cfc64be0 100644 (file)
--- a/tests/compile/extcoerce.pyx
+++ b/tests/compile/extcoerce.pyx
@@ -9,6 +9,7 @@ cdef class Swallow:
 def f(Grail g):
     cdef int i = 0
     cdef Swallow s
+    cdef object x
     g = x
     x = g
     g = i

diff --git a/tests/compile/hinsen2.pyx b/tests/compile/hinsen2.pyx
index 63540ace265e383ae1359379e67e5cd2e6c0b439..390fe2b16a646ffa5b176714f1f8ce1cbc8f32a1 100644 (file)
--- a/tests/compile/hinsen2.pyx
+++ b/tests/compile/hinsen2.pyx
@@ -1,4 +1,4 @@
 cdef class vector:
     def __div__(vector self, double factor):
-        result = vector()
+        cdef object result = vector()
         return result

diff --git a/tests/run/big_indices.pyx b/tests/run/big_indices.pyx
index 6eb642e62ca55fe4704d2249aab3773429857970..4e86c580e195f9a490f69c08a386a5aa325ff58c 100644 (file)
--- a/tests/run/big_indices.pyx
+++ b/tests/run/big_indices.pyx
@@ -8,6 +8,7 @@ def test():
     neg
     pos
     """
+    cdef object D
     cdef long neg = -1
     cdef unsigned long pos = -2 # will be a large positive number
 

diff --git a/tests/run/buffmt.pyx b/tests/run/buffmt.pyx
index 35f3b867cd18c0560f58a232d84ebad3e445cfde..3d740d61eed5403ec8ec93ab96ac3ab424ce7078 100644 (file)
--- a/tests/run/buffmt.pyx
+++ b/tests/run/buffmt.pyx
@@ -177,7 +177,7 @@ def char3int(fmt):
        ...
     ValueError: Buffer dtype mismatch, expected 'int' but got end in 'Char3Int.d'
     """
-    obj = MockBuffer(fmt, sizeof(Char3Int))
+    cdef object obj = MockBuffer(fmt, sizeof(Char3Int))
     cdef object[Char3Int, ndim=1] buf = obj
 
 @testcase
@@ -195,7 +195,7 @@ def unpacked_struct(fmt):
 
     assert (sizeof(UnpackedStruct1) == sizeof(UnpackedStruct2)
             == sizeof(UnpackedStruct3) == sizeof(UnpackedStruct4))
-    obj = MockBuffer(fmt, sizeof(UnpackedStruct1))
+    cdef object obj = MockBuffer(fmt, sizeof(UnpackedStruct1))
     cdef object[UnpackedStruct1, ndim=1] buf1 = obj
     cdef object[UnpackedStruct2, ndim=1] buf2 = obj
     cdef object[UnpackedStruct3, ndim=1] buf3 = obj
@@ -218,7 +218,7 @@ def complex_test(fmt):
     ValueError: Buffer dtype mismatch, expected 'float' but got 'complex float' in 'ComplexFloat.imag'
     
     """
-    obj = MockBuffer(fmt, sizeof(ComplexTest))
+    cdef object obj = MockBuffer(fmt, sizeof(ComplexTest))
     cdef object[ComplexTest] buf1 = obj
     
 

diff --git a/tests/run/builtinnames.pyx b/tests/run/builtinnames.pyx
index 06d425b07bb294dcbfdc8786755dc36f9a4e764e..465395829f507ac913e5e833617c2b29fa86ccf2 100644 (file)
--- a/tests/run/builtinnames.pyx
+++ b/tests/run/builtinnames.pyx
@@ -46,3 +46,13 @@ def test_c(arg):
     print test_file_c(arg)
     print len(arg)
     print type(arg)
+
+def test_for_in_range(arg):
+    """
+    >>> print(str(test_for_in_range('abc')).replace("u'", "'"))
+    ['r', 'a', 'n', 'g', 'e', 'a', 'b', 'c']
+    """
+    l = []
+    for c in range(arg):
+        l.append(c)
+    return l

diff --git a/tests/run/cdef_opt.pyx b/tests/run/cdef_opt.pyx
index 118b2530fb4d7c74e859309431474ae1edae205e..22c34ba9c9cd88378df627a8f2025187244e59da 100644 (file)
--- a/tests/run/cdef_opt.pyx
+++ b/tests/run/cdef_opt.pyx
@@ -23,7 +23,7 @@ def call0():
     >>> call0()
     (True, u'yo')
     """
-    a = A()
+    cdef A a = A()
     return a.foo()
 
 def call1():
@@ -31,7 +31,7 @@ def call1():
     >>> call1()
     (False, u'yo')
     """
-    a = A()
+    cdef A a = A()
     return a.foo(False)
 
 def call2():
@@ -39,5 +39,5 @@ def call2():
     >>> call2()
     (False, u'go')
     """
-    a = A()
+    cdef A a = A()
     return a.foo(False, u"go")

diff --git a/tests/run/cdef_setitem_T284.pyx b/tests/run/cdef_setitem_T284.pyx
index 987c528894d705e8713028f1ba4fb241d0acfe66..03ff384e427cca54b5984e158559d0698429f122 100644 (file)
--- a/tests/run/cdef_setitem_T284.pyx
+++ b/tests/run/cdef_setitem_T284.pyx
@@ -2,10 +2,10 @@ def no_cdef():
     """
     >>> no_cdef()
     """
-    lst = list(range(11))
+    cdef object lst = list(range(11))
     ob = 10L
     lst[ob] = -10
-    dd = {}
+    cdef object dd = {}
     dd[ob] = -10
 
 def with_cdef():

diff --git a/tests/run/inop.pyx b/tests/run/inop.pyx
index 67c15c076d223bc0d063c6b92c2205cc36f9d8e7..df5f2aebfbfe0c0d3822b3d421ac9d23f2ea80a9 100644 (file)
--- a/tests/run/inop.pyx
+++ b/tests/run/inop.pyx
@@ -7,7 +7,7 @@ def f(a,b):
     >>> f(2,(1,2,3))
     True
     """
-    result = a in b
+    cdef object result = a in b
     return result
 
 def g(a,b):
@@ -19,8 +19,7 @@ def g(a,b):
     >>> g(2,(1,2,3))
     1
     """
-    cdef int result
-    result = a in b
+    cdef int result = a in b
     return result
 
 def h(b):
@@ -30,7 +29,7 @@ def h(b):
     >>> h([1,3,4])
     False
     """
-    result = 2 in b
+    cdef object result = 2 in b
     return result
 
 def j(b):
@@ -40,8 +39,7 @@ def j(b):
     >>> j([1,3,4])
     0
     """
-    cdef int result
-    result = 2 in b
+    cdef int result = 2 in b
     return result
 
 def k(a):
@@ -104,8 +102,8 @@ def r(a):
     >>> r(2)
     1
     """
-    l = [1,2,3,4]
-    l2 = [l[1:],l[:-1],l]
+    cdef object l = [1,2,3,4]
+    cdef object l2 = [l[1:],l[:-1],l]
     cdef int result = a in l in l2
     return result
 

diff --git a/tests/run/inplace.pyx b/tests/run/inplace.pyx
index 0db3dba932ce3209821baf8e68490e31b2395801..7ae65753d53d224824de111145666de619c1221d 100644 (file)
--- a/tests/run/inplace.pyx
+++ b/tests/run/inplace.pyx
@@ -107,7 +107,7 @@ def test_side_effects():
     c side effect 4
     ([0, 11, 102, 3, 4], [0, 1, 2, 13, 104])
     """
-    a = list(range(5))
+    cdef object a = list(range(5))
     a[side_effect(1)] += 10
     a[c_side_effect(2)] += 100
     cdef int i

diff --git a/tests/run/isinstance.pyx b/tests/run/isinstance.pyx
index 9fb91f67875af47c620dbf432027e0d84fd7f95f..4b36aa4e3af168a61eb3c49fc18d1f8c3720ac0c 100644 (file)
--- a/tests/run/isinstance.pyx
+++ b/tests/run/isinstance.pyx
@@ -1,18 +1,12 @@
 cdef class A:
     pass
 
-import sys
-IS_PY3 = sys.version_info[0] >= 3
-
 def test_all():
     """
     >>> test_all()
     True
     """
-    if IS_PY3:
-        new_type = type(u'a',(),{})
-    else:
-        new_type = type('a',(),{})
+    new_type = type('a',(),{})
 
     # Optimized tests.
     assert isinstance(new_type, type)

diff --git a/tests/run/kwargproblems.pyx b/tests/run/kwargproblems.pyx
index 97b0a4a375baaa94c805326ad81b80c82d16ad3c..50bef61b510f16ae9ae58cbbae1e25bc21359c1a 100644 (file)
--- a/tests/run/kwargproblems.pyx
+++ b/tests/run/kwargproblems.pyx
@@ -1,4 +1,3 @@
-import sys
 
 def test(**kw):
     """
@@ -19,8 +18,5 @@ def test(**kw):
     >>> d
     {'arg': 2}
     """
-    if sys.version_info[0] >= 3:
-        kw[u'arg'] = 3
-    else:
-        kw['arg'] = 3
+    kw['arg'] = 3
     return kw

diff --git a/tests/run/longlongindex.pyx b/tests/run/longlongindex.pyx
index 22ec638ebfde93872ea79c4db2b6dc52536fc038..6b739083cfcd74459313932b4707a15f1821e846 100644 (file)
--- a/tests/run/longlongindex.pyx
+++ b/tests/run/longlongindex.pyx
@@ -11,7 +11,7 @@ __doc__ = u"""
 ctypedef long long foo
 
 def set_longlong(long long ob, foo x, long y, val):
-    tank = {}
+    cdef object tank = {}
     tank[ob] = val
     tank[x] = val
     tank[y] = val

diff --git a/tests/run/pyobjcast_T313.pyx b/tests/run/pyobjcast_T313.pyx
index 88d6145137511e95375879636a970ce4492b6f2e..aac975af3eb7ffa147a44b4eb0a311414dcd88d1 100644 (file)
--- a/tests/run/pyobjcast_T313.pyx
+++ b/tests/run/pyobjcast_T313.pyx
@@ -14,7 +14,7 @@ cdef extern from *:
 def f():
     cdef void* p1
     cdef PyObject* p2
-    a = u"teststring"
+    cdef object a = u"teststring"
     p1 = <void*>a
     p2 = <PyObject*>a
     return (<object>p1, <object>p2)

diff --git a/tests/run/watts1.pyx b/tests/run/watts1.pyx
index 62ff80e5c0709a3387e77699152e6e40253ac805..b235b429bdf810d4bcf58bf10bf6c0258493a8e8 100644 (file)
--- a/tests/run/watts1.pyx
+++ b/tests/run/watts1.pyx
@@ -4,6 +4,6 @@ def test():
     True
     """
     cdef int a,b
-    foo=(55,66)
-    a,b=foo
+    cdef object foo = (55,66)
+    a,b = foo
     return a + b