Changeset 689106e for python/tests/test_fvec.py

Timestamp:

Apr 18, 2016, 11:24:47 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6db7600

Parents:

1c6fe64

Message:

python/tests/: prepare for python3 (see #33)

File:

• python/tests/test_fvec.py (modified) (6 diffs)

python/tests/test_fvec.py

@@ -20 +20 @@
         assert a.dtype == 'float32'
         assert a.shape == (4,)
-        assert_equal (range(4), a)
+        assert_equal (list(range(4)), a)
 
     def test_vector_assign_element(self):
@@ -42 +42 @@
         a.T
         array(a).T
-        a = range(len(a))
+        a = list(range(len(a)))
 
     def test_wrong_values(self):
@@ -53 +53 @@
     def test_alpha_norm_of_fvec(self):
         a = fvec(2)
-        self.assertEquals (alpha_norm(a, 1), 0)
+        self.assertEqual (alpha_norm(a, 1), 0)
         a[0] = 1
-        self.assertEquals (alpha_norm(a, 1), 0.5)
+        self.assertEqual (alpha_norm(a, 1), 0.5)
         a[1] = 1
-        self.assertEquals (alpha_norm(a, 1), 1)
+        self.assertEqual (alpha_norm(a, 1), 1)
         a = array([0, 1], dtype='float32')
         from math import sqrt
@@ -74 +74 @@
         # check 1d array
         a = array(range(10), dtype = 'float32')
-        self.assertEquals (alpha_norm(a, 1), 4.5)
+        self.assertEqual (alpha_norm(a, 1), 4.5)
 
     def test_alpha_norm_of_array_of_int(self):
@@ -92 +92 @@
         assert_almost_equal (zero_crossing_rate(a), 1./3. )
         a = array([0.]*100, dtype='float32')
-        self.assertEquals (zero_crossing_rate(a), 0 )
+        self.assertEqual (zero_crossing_rate(a), 0 )
         a = array([-1.]*100, dtype='float32')
-        self.assertEquals (zero_crossing_rate(a), 0 )
+        self.assertEqual (zero_crossing_rate(a), 0 )
         a = array([1.]*100, dtype='float32')
-        self.assertEquals (zero_crossing_rate(a), 0 )
+        self.assertEqual (zero_crossing_rate(a), 0 )
 
     def test_alpha_norm_of_array_of_float64(self):
@@ -106 +106 @@
         self.assertRaises (ValueError, alpha_norm, a, 1)
         # check float64 1d array fail
-        a = array(range(10), dtype = 'float64')
+        a = array(list(range(10)), dtype = 'float64')
         self.assertRaises (ValueError, alpha_norm, a, 1)
         # check float64 2d array fail
-        a = array([range(10), range(10)], dtype = 'float64')
+        a = array([list(range(10)), list(range(10))], dtype = 'float64')
         self.assertRaises (ValueError, alpha_norm, a, 1)