From: Thomas Fillon Date: Wed, 23 Apr 2014 08:23:44 +0000 (+0200) Subject: Homogenize __init__.py. Fix #46 X-Git-Tag: 0.5.5~1^2~38^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e088d05d5995a8d3eca46d81dbdaa9e782f23f51;p=timeside.git Homogenize __init__.py. Fix #46 --- diff --git a/tests/test_analyzer_level.py b/tests/test_analyzer_level.py index 936cb16..97c1f66 100755 --- 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 16506ac..5356001 100755 --- 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 e774aca..2c40287 100755 --- 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 9de6b81..cb43bcd 100755 --- 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 51dfaff..4e561c6 100755 --- 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 9f6d5ac..7011da6 100755 --- 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 714893f..a7ed80a 100755 --- 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 d527231..ce217f4 100644 --- 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 3f5eb52..b49b82a 100644 --- 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 384be37..f2a2548 100644 --- 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 ab1c3a4..ee59bda 100644 --- 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 4303fa2..4c6d4ee 100644 --- 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 db44451..e362997 100644 --- 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 3dc6227..7adbf3c 100644 --- 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 3896805..beb42d1 100644 --- 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 *