Homogenize __init__.py. Fix #46

diff --git a/tests/test_analyzer_level.py b/tests/test_analyzer_level.py
index 936cb1609a9022785473dc5475bd4f4be2be8ef3..97c1f66bc1a5204f60d3e256fd208cdff84faa8e 100755 (executable)
--- a/tests/test_analyzer_level.py
+++ b/tests/test_analyzer_level.py
@@ -1,8 +1,9 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import *
+from timeside.decoder import FileDecoder
 from timeside.analyzer.level import Level
+import os
 
 class TestAnalyzerLevel(unittest.TestCase):
 

diff --git a/tests/test_aubio_melenergy.py b/tests/test_aubio_melenergy.py
index 16506ac893094927a28be9c898c57b8c8de8b1d3..53560014140719ef6c82a813d2858caae0d38298 100755 (executable)
--- a/tests/test_aubio_melenergy.py
+++ b/tests/test_aubio_melenergy.py
@@ -1,11 +1,11 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import *
+from timeside.decoder import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_melenergy import AubioMelEnergy
-
+import os
 
 @unittest.skipIf(not WITH_AUBIO, 'Aubio library is not available')
 class TestAubioMelEnergy(unittest.TestCase):

diff --git a/tests/test_aubio_mfcc.py b/tests/test_aubio_mfcc.py
index e774acae8c72364a5d2ed17ff449b78ddd83c469..2c40287ebfe3a63933167001e30d89fcf1176b2b 100755 (executable)
--- a/tests/test_aubio_mfcc.py
+++ b/tests/test_aubio_mfcc.py
@@ -1,10 +1,11 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import *
+from timeside.decoder import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_mfcc import AubioMfcc
+import os
 
 
 @unittest.skipIf(not WITH_AUBIO, 'Aubio library is not available')

diff --git a/tests/test_aubio_pitch.py b/tests/test_aubio_pitch.py
index 9de6b81d4a2cfab6c744de673d10e867d0f62e36..cb43bcd00e7946370cb4ebcf2652265e42058b79 100755 (executable)
--- a/tests/test_aubio_pitch.py
+++ b/tests/test_aubio_pitch.py
@@ -5,6 +5,7 @@ from timeside.decoder import *
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_pitch import AubioPitch
+import os
 
 
 @unittest.skipIf(not WITH_AUBIO, 'Aubio library is not available')

diff --git a/tests/test_aubio_specdesc.py b/tests/test_aubio_specdesc.py
index 51dfaff5d4423cbc75f46858f279c4fb0a4f1050..4e561c6c2ef0f8646f355d3fc754e86cf3405a21 100755 (executable)
--- a/tests/test_aubio_specdesc.py
+++ b/tests/test_aubio_specdesc.py
@@ -1,10 +1,11 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import *
+from timeside.decoder import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_specdesc import AubioSpecdesc
+import os
 
 
 @unittest.skipIf(not WITH_AUBIO, 'Aubio library is not available')

diff --git a/tests/test_aubio_temporal.py b/tests/test_aubio_temporal.py
index 9f6d5acf302f2c6a16e0fa0a4e94922fcc6be9b6..7011da68ebbdd956cd3aae8dfed3de124e9a35ee 100755 (executable)
--- a/tests/test_aubio_temporal.py
+++ b/tests/test_aubio_temporal.py
@@ -1,10 +1,11 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import *
+from timeside.decoder import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_temporal import AubioTemporal
+import os
 
 
 @unittest.skipIf(not WITH_AUBIO, 'Aubio library is not available')

diff --git a/tests/test_yaafe.py b/tests/test_yaafe.py
index 714893fb996bffdf7a3e64fdd75fe31938ee8ba9..a7ed80a641aae66afdce7f94f233650013792ef4 100755 (executable)
--- a/tests/test_yaafe.py
+++ b/tests/test_yaafe.py
@@ -1,11 +1,12 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import *
+from timeside.decoder import FileDecoder
 from timeside.analyzer import WITH_YAAFE
 if WITH_YAAFE:
     from timeside.analyzer import Yaafe
     from yaafelib import DataFlow, FeaturePlan
+import os
 
 
 @unittest.skipIf(not WITH_YAAFE, 'Yaafe library is not available')

diff --git a/timeside/__init__.py b/timeside/__init__.py
index d527231cc6549e457168ddb417f55eb74d900f48..ce217f4950e3fca4b2e5e3837ef6dcf7fb536abe 100644 (file)
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@ -8,3 +8,5 @@ import grapher
 import encoder
 
 __version__ = '0.5.5'
+
+__all__ = ['api', 'core', 'decoder', 'analyzer', 'grapher', 'encoder']

diff --git a/timeside/analyzer/__init__.py b/timeside/analyzer/__init__.py
index 3f5eb52b9eabeb5b38d3ecd46e5a5015d2699519..b49b82aeb8c73b538b4d142a1aa57cda44ec4b77 100644 (file)
--- a/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@ -6,16 +6,16 @@ try:
     WITH_AUBIO = True
     from aubio_temporal import AubioTemporal
     from aubio_pitch import AubioPitch
-    from aubio_mfcc import *
-    from aubio_melenergy import *
-    from aubio_specdesc import *
+    from aubio_mfcc import AubioMfcc
+    from aubio_melenergy import AubioMelEnergy
+    from aubio_specdesc import AubioSpecdesc
 except ImportError:
     WITH_AUBIO = False
 
 # Yaafe
 try:
     WITH_YAAFE = True
-    from yaafe import *
+    from yaafe import Yaafe
 
 except ImportError:
     WITH_YAAFE = False

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index 384be373f3ecb5c91bae7dd3440986cd0dccd86d..f2a2548809d6e46145d4901c47726d09d7c43b55 100644 (file)
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@ -867,10 +867,11 @@ class AnalyzerResultContainer(dict):
 
     '''
     >>> import timeside
+    >>> from timeside.analyzer.core import Analyzer
     >>> wav_file = 'tests/samples/sweep.mp3' # doctest: +SKIP
     >>> d = timeside.decoder.FileDecoder(wav_file)
 
-    >>> a = timeside.analyzer.Analyzer()
+    >>> a = Analyzer()
     >>> (d|a).run()
     >>> a.new_result() #doctest: +ELLIPSIS
     FrameValueResult(id_metadata=IdMetadata(id='analyzer', name='Generic analyzer', unit='', description='', date='...', version='...', author='TimeSide', uuid='...'), data_object=DataObject(value=array([], dtype=float64)), audio_metadata=AudioMetadata(uri='...', start=0.0, duration=8.0..., is_segment=False, sha1='...', channels=2, channelsManagement=''), frame_metadata=FrameMetadata(samplerate=44100, blocksize=8192, stepsize=8192), parameters={})

diff --git a/timeside/decoder/__init__.py b/timeside/decoder/__init__.py
index ab1c3a43f382bbd54e8acef4ed95bd93c178f5e8..ee59bda17af42276a5fc17b0e29cd9c81d5bc705 100644 (file)
--- a/timeside/decoder/__init__.py
+++ b/timeside/decoder/__init__.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from file import *
-from array import *
-from live import *
+from file import FileDecoder
+from array import ArrayDecoder
+from live import LiveDecoder
+
+__all__ = ['FileDecoder', 'ArrayDecoder', 'LiveDecoder']

diff --git a/timeside/encoder/__init__.py b/timeside/encoder/__init__.py
index 4303fa2838b88934f7aa04ad0802507f9daf7f9c..4c6d4eefc18a22b0f0a4a3f55bb95c5e2ef9915a 100644 (file)
--- a/timeside/encoder/__init__.py
+++ b/timeside/encoder/__init__.py
@@ -8,3 +8,6 @@ from m4a import AacEncoder
 from webm import WebMEncoder
 from audiosink import AudioSink
 from opus import OpusEncoder
+
+__all__ = ['VorbisEncoder', 'WavEncoder', 'Mp3Encoder', 'FlacEncoder',
+           'AacEncoder', 'WebMEncoder', 'AudioSink', 'OpusEncoder']

diff --git a/timeside/grapher/__init__.py b/timeside/grapher/__init__.py
index db444516cb11d353fa416913a9dff1a3f61c76fc..e362997d7cbb9955f0d89480a983610c03935e8b 100644 (file)
--- a/timeside/grapher/__init__.py
+++ b/timeside/grapher/__init__.py
@@ -1,9 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from waveform_simple import *
-from waveform_centroid import *
-from waveform_transparent import *
-from waveform_contour import *
-from spectrogram_log import *
-from spectrogram_lin import *
-from render_analyzers import *
+from waveform_simple import Waveform
+from waveform_centroid import WaveformCentroid
+from waveform_transparent import WaveformTransparent
+from waveform_contour import WaveformContourBlack, WaveformContourWhite
+from spectrogram_log import SpectrogramLog
+from spectrogram_lin import SpectrogramLinear
+from render_analyzers import DisplayOnsetDetectionFunction, DisplayWaveform
+from render_analyzers import Display4hzSpeechSegmentation
+
+__all__ = ['Waveform', 'WaveformCentroid', 'WaveformTransparent',
+           'WaveformContourBlack', 'WaveformContourWhite',
+           'SpectrogramLog', 'SpectrogramLinear',
+           'DisplayOnsetDetectionFunction', 'DisplayWaveform',
+           'Display4hzSpeechSegmentation']

diff --git a/timeside/grapher/utils.py b/timeside/grapher/utils.py
index 3dc62276ed37d931ca76572123b8fff0aef05412..7adbf3c616c4f6280d5d6ba53dd6bfcc37973b59 100644 (file)
--- a/timeside/grapher/utils.py
+++ b/timeside/grapher/utils.py
@@ -116,7 +116,7 @@ def smooth(x, window_len=10, window='hanning'):
     --------
 
     >>> import numpy as np
-    >>> from timeside.grapher import smooth
+    >>> from timeside.grapher.utils import smooth
     >>> t = np.arange(-2,2,0.1)
     >>> x = np.sin(t)+np.random.randn(len(t))*0.1
     >>> y = smooth(x)

diff --git a/timeside/tools/__init__.py b/timeside/tools/__init__.py
index 3896805bf59323c689cb399cf433bf4b7ff7f50e..beb42d1bb1eef204cc067fcd66f2fcc2a9932802 100644 (file)
--- a/timeside/tools/__init__.py
+++ b/timeside/tools/__init__.py
@@ -1,3 +1,3 @@
-from cache import *
-from logger import *
+from cache import Cache
+from logger import Logger
 from gstutils import *