Showing the changes to python/tests (7 of 7 files). Show all
Unified · Split
| @@ -19,7 +19,7 @@ class aubio_fvec_test_case(TestCase): · 18 unmodified lines | ||
| 19 | 19 | a = fvec([0,1,2,3]) |
| 20 | 20 | assert a.dtype == 'float32' |
| 21 | 21 | assert a.shape == (4,) |
| 22 | − assert_equal (range(4), a) | |
| 22 | + assert_equal (list(range(4)), a) | |
| 23 | 23 | |
| 24 | 24 | def test_vector_assign_element(self): |
| 25 | 25 | a = fvec(default_size) |
| @@ -41,7 +41,7 @@ class aubio_fvec_test_case(TestCase): · 15 unmodified lines | ||
| 41 | 41 | a = fvec(1) |
| 42 | 42 | a.T |
| 43 | 43 | array(a).T |
| 44 | − a = range(len(a)) | |
| 44 | + a = list(range(len(a))) | |
| 45 | 45 | |
| 46 | 46 | def test_wrong_values(self): |
| 47 | 47 | self.assertRaises (ValueError, fvec, -10) |
| @@ -52,11 +52,11 @@ class aubio_fvec_test_case(TestCase): · 4 unmodified lines | ||
| 52 | 52 | |
| 53 | 53 | def test_alpha_norm_of_fvec(self): |
| 54 | 54 | a = fvec(2) |
| 55 | − self.assertEquals (alpha_norm(a, 1), 0) | |
| 55 | + self.assertEqual (alpha_norm(a, 1), 0) | |
| 56 | 56 | a[0] = 1 |
| 57 | − self.assertEquals (alpha_norm(a, 1), 0.5) | |
| 57 | + self.assertEqual (alpha_norm(a, 1), 0.5) | |
| 58 | 58 | a[1] = 1 |
| 59 | − self.assertEquals (alpha_norm(a, 1), 1) | |
| 59 | + self.assertEqual (alpha_norm(a, 1), 1) | |
| 60 | 60 | a = array([0, 1], dtype='float32') |
| 61 | 61 | from math import sqrt |
| 62 | 62 | assert_almost_equal (alpha_norm(a, 2), sqrt(2)/2.) |
| @@ -73,7 +73,7 @@ class aubio_fvec_test_case(TestCase): · 10 unmodified lines | ||
| 73 | 73 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 74 | 74 | # check 1d array |
| 75 | 75 | a = array(range(10), dtype = 'float32') |
| 76 | − self.assertEquals (alpha_norm(a, 1), 4.5) | |
| 76 | + self.assertEqual (alpha_norm(a, 1), 4.5) | |
| 77 | 77 | |
| 78 | 78 | def test_alpha_norm_of_array_of_int(self): |
| 79 | 79 | a = array(1, dtype = 'int') |
| @@ -91,11 +91,11 @@ class aubio_fvec_test_case(TestCase): · 11 unmodified lines | ||
| 91 | 91 | a = array([0,1,-1], dtype='float32') |
| 92 | 92 | assert_almost_equal (zero_crossing_rate(a), 1./3. ) |
| 93 | 93 | a = array([0.]*100, dtype='float32') |
| 94 | − self.assertEquals (zero_crossing_rate(a), 0 ) | |
| 94 | + self.assertEqual (zero_crossing_rate(a), 0 ) | |
| 95 | 95 | a = array([-1.]*100, dtype='float32') |
| 96 | − self.assertEquals (zero_crossing_rate(a), 0 ) | |
| 96 | + self.assertEqual (zero_crossing_rate(a), 0 ) | |
| 97 | 97 | a = array([1.]*100, dtype='float32') |
| 98 | − self.assertEquals (zero_crossing_rate(a), 0 ) | |
| 98 | + self.assertEqual (zero_crossing_rate(a), 0 ) | |
| 99 | 99 | |
| 100 | 100 | def test_alpha_norm_of_array_of_float64(self): |
| 101 | 101 | # check scalar fail |
| @@ -105,10 +105,10 @@ class aubio_fvec_test_case(TestCase): · 3 unmodified lines | ||
| 105 | 105 | a = array([[[1,2],[3,4]]], dtype = 'float64') |
| 106 | 106 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 107 | 107 | # check float64 1d array fail |
| 108 | − a = array(range(10), dtype = 'float64') | |
| 108 | + a = array(list(range(10)), dtype = 'float64') | |
| 109 | 109 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 110 | 110 | # check float64 2d array fail |
| 111 | − a = array([range(10), range(10)], dtype = 'float64') | |
| 111 | + a = array([list(range(10)), list(range(10))], dtype = 'float64') | |
| 112 | 112 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 113 | 113 | |
| 114 | 114 | def test_fvec_min_removal_of_array(self): |
| @@ -12,7 +12,7 @@ class aubio_mathutils(TestCase): · 11 unmodified lines | ||
| 12 | 12 | def test_unwrap2pi(self): |
| 13 | 13 | unwrap2pi(int(23)) |
| 14 | 14 | unwrap2pi(float(23.)) |
| 15 | − unwrap2pi(long(23.)) | |
| 15 | + unwrap2pi(int(23.)) | |
| 16 | 16 | unwrap2pi(arange(10)) |
| 17 | 17 | unwrap2pi(arange(10).astype("int")) |
| 18 | 18 | unwrap2pi(arange(10).astype("float")) |
| @@ -27,8 +27,8 @@ class aubio_mathutils(TestCase): · 8 unmodified lines | ||
| 27 | 27 | #print zip(a, b) |
| 28 | 28 | |
| 29 | 29 | try: |
| 30 | − print unwrap2pi(["23.","24.",25.]) | |
| 31 | − except Exception, e: | |
| 30 | + print (unwrap2pi(["23.","24.",25.])) | |
| 31 | + except Exception as e: | |
| 32 | 32 | pass |
| 33 | 33 | |
| 34 | 34 | def test_unwrap2pi_takes_fvec(self): |
| @@ -53,7 +53,7 @@ class aubio_mathutils(TestCase): · 18 unmodified lines | ||
| 53 | 53 | assert ( b <= pi ).all() |
| 54 | 54 | |
| 55 | 55 | def test_freqtomidi(self): |
| 56 | − a = array(range(-20, 50000, 100) + [ -1e32, 1e32 ]) | |
| 56 | + a = array(list(range(-20, 50000, 100)) + [ -1e32, 1e32 ]) | |
| 57 | 57 | b = freqtomidi(a) |
| 58 | 58 | #print zip(a, b) |
| 59 | 59 | assert_equal ( isnan(array(b)), False ) |
| @@ -61,7 +61,7 @@ class aubio_mathutils(TestCase): · 1 unmodified line | ||
| 61 | 61 | assert_equal ( array(b) < 0, False ) |
| 62 | 62 | |
| 63 | 63 | def test_miditofreq(self): |
| 64 | − a = range(-30, 200) + [-100000, 10000] | |
| 64 | + a = list(range(-30, 200)) + [-100000, 10000] | |
| 65 | 65 | b = miditofreq(a) |
| 66 | 66 | #print zip(a, b) |
| 67 | 67 | assert_equal ( isnan(b), False ) |
| @@ -69,7 +69,7 @@ class aubio_mathutils(TestCase): · 1 unmodified line | ||
| 69 | 69 | assert_equal ( b < 0, False ) |
| 70 | 70 | |
| 71 | 71 | def test_miditobin(self): |
| 72 | − a = range(-30, 200) + [-100000, 10000] | |
| 72 | + a = list(range(-30, 200)) + [-100000, 10000] | |
| 73 | 73 | b = [ bintomidi(x, 44100, 512) for x in a ] |
| 74 | 74 | #print zip(a, b) |
| 75 | 75 | assert_equal ( isnan(array(b)), False ) |
| @@ -77,7 +77,7 @@ class aubio_mathutils(TestCase): · 1 unmodified line | ||
| 77 | 77 | assert_equal ( array(b) < 0, False ) |
| 78 | 78 | |
| 79 | 79 | def test_bintomidi(self): |
| 80 | − a = range(-100, 512) | |
| 80 | + a = list(range(-100, 512)) | |
| 81 | 81 | b = [ bintomidi(x, 44100, 512) for x in a ] |
| 82 | 82 | #print zip(a, b) |
| 83 | 83 | assert_equal ( isnan(array(b)), False ) |
| @@ -85,7 +85,7 @@ class aubio_mathutils(TestCase): · 1 unmodified line | ||
| 85 | 85 | assert_equal ( array(b) < 0, False ) |
| 86 | 86 | |
| 87 | 87 | def test_freqtobin(self): |
| 88 | − a = range(-20, 50000, 100) + [ -1e32, 1e32 ] | |
| 88 | + a = list(range(-20, 50000, 100)) + [ -1e32, 1e32 ] | |
| 89 | 89 | b = [ freqtobin(x, 44100, 512) for x in a ] |
| 90 | 90 | #print zip(a, b) |
| 91 | 91 | assert_equal ( isnan(array(b)), False ) |
| @@ -93,7 +93,7 @@ class aubio_mathutils(TestCase): · 1 unmodified line | ||
| 93 | 93 | assert_equal ( array(b) < 0, False ) |
| 94 | 94 | |
| 95 | 95 | def test_bintofreq(self): |
| 96 | − a = range(-20, 148) | |
| 96 | + a = list(range(-20, 148)) | |
| 97 | 97 | b = [ bintofreq(x, 44100, 512) for x in a ] |
| 98 | 98 | #print zip(a, b) |
| 99 | 99 | assert_equal ( isnan(array(b)), False ) |
| @@ -17,7 +17,7 @@ class aubio_window(TestCase): · 16 unmodified lines | ||
| 17 | 17 | def test_fail_name_not_string(self): |
| 18 | 18 | try: |
| 19 | 19 | window(10, 1024) |
| 20 | − except ValueError, e: | |
| 20 | + except ValueError as e: | |
| 21 | 21 | pass |
| 22 | 22 | else: |
| 23 | 23 | self.fail('non-string window type does not raise a ValueError') |
| @@ -25,7 +25,7 @@ class aubio_window(TestCase): · 1 unmodified line | ||
| 25 | 25 | def test_fail_size_not_int(self): |
| 26 | 26 | try: |
| 27 | 27 | window("default", "default") |
| 28 | − except ValueError, e: | |
| 28 | + except ValueError as e: | |
| 29 | 29 | pass |
| 30 | 30 | else: |
| 31 | 31 | self.fail('non-integer window length does not raise a ValueError') |
| @@ -43,7 +43,7 @@ class aubio_level_lin(TestCase): · 11 unmodified lines | ||
| 43 | 43 | def test_fail_not_fvec(self): |
| 44 | 44 | try: |
| 45 | 45 | level_lin("default") |
| 46 | − except ValueError, e: | |
| 46 | + except ValueError as e: | |
| 47 | 47 | pass |
| 48 | 48 | else: |
| 49 | 49 | self.fail('non-number input phase does not raise a TypeError') |
| @@ -62,7 +62,7 @@ class aubio_db_spl(TestCase): · 12 unmodified lines | ||
| 62 | 62 | def test_fail_not_fvec(self): |
| 63 | 63 | try: |
| 64 | 64 | db_spl("default") |
| 65 | − except ValueError, e: | |
| 65 | + except ValueError as e: | |
| 66 | 66 | pass |
| 67 | 67 | else: |
| 68 | 68 | self.fail('non-number input phase does not raise a TypeError') |
| @@ -82,7 +82,7 @@ class aubio_silence_detection(TestCase): · 13 unmodified lines | ||
| 82 | 82 | def test_fail_not_fvec(self): |
| 83 | 83 | try: |
| 84 | 84 | silence_detection("default", -70) |
| 85 | − except ValueError, e: | |
| 85 | + except ValueError as e: | |
| 86 | 86 | pass |
| 87 | 87 | else: |
| 88 | 88 | self.fail('non-number input phase does not raise a TypeError') |
| @@ -102,7 +102,7 @@ class aubio_level_detection(TestCase): · 13 unmodified lines | ||
| 102 | 102 | def test_fail_not_fvec(self): |
| 103 | 103 | try: |
| 104 | 104 | level_detection("default", -70) |
| 105 | − except ValueError, e: | |
| 105 | + except ValueError as e: | |
| 106 | 106 | pass |
| 107 | 107 | else: |
| 108 | 108 | self.fail('non-number input phase does not raise a TypeError') |
| @@ -63,7 +63,7 @@ class aubio_pvoc_test_case(TestCase): · 62 unmodified lines | ||
| 63 | 63 | sigin = fvec(hop_s) |
| 64 | 64 | zeros = fvec(hop_s) |
| 65 | 65 | f = pvoc(buf_s, hop_s) |
| 66 | − for i in xrange(hop_s): | |
| 66 | + for i in range(hop_s): | |
| 67 | 67 | sigin[i] = random() * 2. - 1. |
| 68 | 68 | t2 = f.rdo( f(sigin) ) |
| 69 | 69 | t2 = f.rdo( f(zeros) ) |
| @@ -24,14 +24,14 @@ class aubio_pitch_Good_Values(TestCase): · 23 unmodified lines | ||
| 24 | 24 | " running on silence gives 0 " |
| 25 | 25 | p = pitch('default', 2048, 512, 32000) |
| 26 | 26 | f = fvec (512) |
| 27 | − for i in xrange(10): assert_equal (p(f), 0.) | |
| 27 | + for i in range(10): assert_equal (p(f), 0.) | |
| 28 | 28 | |
| 29 | 29 | def test_run_on_ones(self): |
| 30 | 30 | " running on ones gives 0 " |
| 31 | 31 | p = pitch('default', 2048, 512, 32000) |
| 32 | 32 | f = fvec (512) |
| 33 | 33 | f[:] = 1 |
| 34 | − for i in xrange(10): assert_equal (p(f), 0.) | |
| 34 | + for i in range(10): assert_equal (p(f), 0.) | |
| 35 | 35 | |
| 36 | 36 | class aubio_pitch_Sinusoid(TestCase): |
| 37 | 37 | |
| @@ -44,7 +44,7 @@ class aubio_sink_test_case(TestCase): · 43 unmodified lines | ||
| 44 | 44 | for n in range(200): |
| 45 | 45 | vec = fvec(write) |
| 46 | 46 | g(vec, write) |
| 47 | − except StandardError: | |
| 47 | + except Exception: | |
| 48 | 48 | pass |
| 49 | 49 | else: |
| 50 | 50 | self.fail("does not fail on too many files open") |
| @@ -70,11 +70,11 @@ class aubio_sink_test_case(TestCase): · 19 unmodified lines | ||
| 70 | 70 | total_frames += read |
| 71 | 71 | if read < f.hop_size: break |
| 72 | 72 | if 0: |
| 73 | − print "read", "%.2fs" % (total_frames / float(f.samplerate) ), | |
| 74 | − print "(", total_frames, "frames", "in", | |
| 75 | − print total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")", | |
| 76 | − print "from", f.uri, | |
| 77 | − print "to", g.uri | |
| 73 | + print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ), | |
| 74 | + print ("(", total_frames, "frames", "in" ), | |
| 75 | + print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ), | |
| 76 | + print ("from", f.uri ), | |
| 77 | + print ("to", g.uri) | |
| 78 | 78 | del_tmp_sink_path(sink_path) |
| 79 | 79 | |
| 80 | 80 | def test_read_and_write_multi(self): |
| @@ -95,13 +95,13 @@ class aubio_sink_test_case(TestCase): · 14 unmodified lines | ||
| 95 | 95 | total_frames += read |
| 96 | 96 | if read < f.hop_size: break |
| 97 | 97 | if 0: |
| 98 | − print "read", "%.2fs" % (total_frames / float(f.samplerate) ), | |
| 99 | − print "(", total_frames, "frames", "in", | |
| 100 | − print f.channels, "channels", "in", | |
| 101 | − print total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")", | |
| 102 | − print "from", f.uri, | |
| 103 | − print "to", g.uri, | |
| 104 | − print "in", g.channels, "channels" | |
| 98 | + print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ), | |
| 99 | + print ("(", total_frames, "frames", "in" ), | |
| 100 | + print (f.channels, "channels", "in" ), | |
| 101 | + print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ), | |
| 102 | + print ("from", f.uri ), | |
| 103 | + print ("to", g.uri ), | |
| 104 | + print ("in", g.channels, "channels") | |
| 105 | 105 | del_tmp_sink_path(sink_path) |
| 106 | 106 | |
| 107 | 107 | def test_close_file(self): |
| @@ -38,10 +38,10 @@ class aubio_source_read_test_case(aubio_source_test_case_base): · 37 unmodified lines | ||
| 38 | 38 | vec, read = f() |
| 39 | 39 | total_frames += read |
| 40 | 40 | if read < f.hop_size: break |
| 41 | − print "read", "%.2fs" % (total_frames / float(f.samplerate) ), | |
| 42 | − print "(", total_frames, "frames", "in", | |
| 43 | − print total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")", | |
| 44 | − print "from", f.uri | |
| 41 | + print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ), | |
| 42 | + print ("(", total_frames, "frames", "in" ), | |
| 43 | + print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ), | |
| 44 | + print ("from", f.uri) | |
| 45 | 45 | return total_frames |
| 46 | 46 | |
| 47 | 47 | def test_samplerate_hopsize(self): |
| @@ -67,7 +67,7 @@ class aubio_source_read_test_case(aubio_source_test_case_base): · 19 unmodified lines | ||
| 67 | 67 | for p in list_of_sounds: |
| 68 | 68 | try: |
| 69 | 69 | f = source(p, -1) |
| 70 | − except ValueError, e: | |
| 70 | + except ValueError as e: | |
| 71 | 71 | pass |
| 72 | 72 | else: |
| 73 | 73 | self.fail('negative samplerate does not raise ValueError') |
| @@ -76,7 +76,7 @@ class aubio_source_read_test_case(aubio_source_test_case_base): · 2 unmodified lines | ||
| 76 | 76 | for p in list_of_sounds: |
| 77 | 77 | try: |
| 78 | 78 | f = source(p, 0, -1) |
| 79 | − except ValueError, e: | |
| 79 | + except ValueError as e: | |
| 80 | 80 | pass |
| 81 | 81 | else: |
| 82 | 82 | self.fail('negative hop_size does not raise ValueError') |
| @@ -108,11 +108,11 @@ class aubio_source_readmulti_test_case(aubio_source_read_test_case): · 25 unmodified lines | ||
| 108 | 108 | vec, read = f.do_multi() |
| 109 | 109 | total_frames += read |
| 110 | 110 | if read < f.hop_size: break |
| 111 | − print "read", "%.2fs" % (total_frames / float(f.samplerate) ), | |
| 112 | − print "(", total_frames, "frames", "in", | |
| 113 | − print f.channels, "channels and", | |
| 114 | − print total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")", | |
| 115 | − print "from", f.uri | |
| 111 | + print ("read", "%.2fs" % (total_frames / float(f.samplerate) ) ), | |
| 112 | + print ("(", total_frames, "frames", "in" ), | |
| 113 | + print (f.channels, "channels and" ), | |
| 114 | + print (total_frames / f.hop_size, "blocks", "at", "%dHz" % f.samplerate, ")" ), | |
| 115 | + print ("from", f.uri) | |
| 116 | 116 | return total_frames |
| 117 | 117 | |
| 118 | 118 | if __name__ == '__main__': |