Changeset 0b6d23d for python/tests/utils.py

Timestamp:

May 16, 2016, 5:08:18 AM (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:

a6f9ebf

Parents:

58a5fb9

Message:

python/tests: fix most prospect warnings

File:

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

python/tests/utils.py

@@ -1 +1 @@
 #! /usr/bin/env python
 
+import os
+import glob
+import numpy as np
+from tempfile import mkstemp
+
 def array_from_text_file(filename, dtype = 'float'):
-    import os.path
-    from numpy import array
     filename = os.path.join(os.path.dirname(__file__), filename)
     with open(filename) as f:
         lines = f.readlines()
-    return array([line.split() for line in lines],
+    return np.array([line.split() for line in lines],
             dtype = dtype)
 
 def list_all_sounds(rel_dir):
-    import os.path, glob
     datadir = os.path.join(os.path.dirname(__file__), rel_dir)
     return glob.glob(os.path.join(datadir,'*.*'))
@@ -23 +25 @@
 
 def get_tmp_sink_path():
-    from tempfile import mkstemp
-    import os
     fd, path = mkstemp()
     os.close(fd)
@@ -30 +30 @@
 
 def del_tmp_sink_path(path):
-    import os
     os.unlink(path)
 
@@ -46 +45 @@
     total_frames = 0
     while True:
-        samples, read = s()
+        _, read = s()
         total_frames += read
         if read < hopsize: break
@@ -52 +51 @@
 
 def count_samples_in_directory(samples_dir):
-    import os
     total_frames = 0
     for f in os.walk(samples_dir):
@@ -63 +61 @@
 
 def count_files_in_directory(samples_dir):
-    import os
     total_files = 0
     for f in os.walk(samples_dir):