Fix import path after moving tools submodule

diff --git a/doc/source/intro.rst b/doc/source/intro.rst
index 0f09df94dae868f707771464255b537308a69e0c..0ce1eeaa860f6cf03d1d23b78ae1de192d920d8f 100644 (file)
--- a/doc/source/intro.rst
+++ b/doc/source/intro.rst
@@ -60,7 +60,7 @@ Dive in
 
 To list all available plugins:
 
-.. doctest:: 
+.. doctest::
 
    >>> import timeside
    >>> timeside.core.list_processors()  # doctest: +SKIP
@@ -73,7 +73,7 @@ Define some processors:
 .. doctest::
 
     >>> from timeside.core import get_processor
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> wavfile = samples['sweep.wav']
     >>> decoder  =  get_processor('file_decoder')(wavfile)
     >>> grapher  =  get_processor('waveform_simple')()
@@ -82,19 +82,19 @@ Define some processors:
 
 Then run the *magic* pipeline:
 
-.. doctest:: 
+.. doctest::
 
     >>> (decoder | grapher | analyzer | encoder).run()
 
 Render the grapher results:
 
-.. doctest:: 
+.. doctest::
 
     >>> grapher.render(output='waveform.png')
 
 Show the analyzer results:
 
-.. doctest:: 
+.. doctest::
 
     >>> print 'Level:', analyzer.results  # doctest: +ELLIPSIS
     Level: {'level.max': AnalyzerResult(...)}

diff --git a/doc/source/tutorial/Streaming.rst b/doc/source/tutorial/Streaming.rst
index 0826aceeb7087ef485a7bfda091c20b1f7a1d610..d404390f3d3a3e9521e4ccc02719c1002e5fc0c3 100644 (file)
--- a/doc/source/tutorial/Streaming.rst
+++ b/doc/source/tutorial/Streaming.rst
@@ -8,7 +8,7 @@ Instead of calling a pipe.run(), the chunks of an encoding processor can also be
 
 >>> import timeside
 >>> from timeside.core import get_processor
->>> from timeside.tools.test_samples import samples
+>>> from timeside.core.tools.test_samples import samples
 >>> import numpy as np
 >>> audio_file = samples['sweep.wav']
 >>> decoder = get_processor('file_decoder')(audio_file, duration=1)

diff --git a/doc/source/tutorial/frames_stack.rst b/doc/source/tutorial/frames_stack.rst
index 39075ae011d049b04b908ddd757917f268d1049f..63142200586eebc0802e03f85477cf70a313836e 100644 (file)
--- a/doc/source/tutorial/frames_stack.rst
+++ b/doc/source/tutorial/frames_stack.rst
@@ -11,7 +11,7 @@ First, let's import everything and define the audio file source :
 
 >>> import timeside.core
 >>> from timeside.core import get_processor
->>> from timeside.tools.test_samples import samples
+>>> from timeside.core.tools.test_samples import samples
 >>> import numpy as np
 >>> audio_file = samples['sweep.mp3']
 

diff --git a/doc/source/tutorial/quick_start.rst b/doc/source/tutorial/quick_start.rst
index 93bf19565c3f5c315bb1b878bd127538d9b9decc..a811b0564af453f8d774a6d21a73840535bcd474 100644 (file)
--- a/doc/source/tutorial/quick_start.rst
+++ b/doc/source/tutorial/quick_start.rst
@@ -20,7 +20,7 @@ A most basic operation, transcoding, is easily performed with two processors:
 .. doctest:: test_1
 
  >>> import timeside
- >>> from timeside.tools.test_samples import samples
+ >>> from timeside.core.tools.test_samples import samples
  >>> from timeside.core import get_processor
  >>> decoder = get_processor('file_decoder')(samples["sweep.wav"])
  >>> encoder = get_processor('vorbis_encoder')("sweep.ogg")
@@ -36,7 +36,7 @@ Spectrogram. All graphers return an image:
 .. doctest:: test_2
 
    >>> import timeside
-   >>> from timeside.tools.test_samples import samples
+   >>> from timeside.core.tools.test_samples import samples
    >>> from timeside.core import get_processor
    >>> decoder =  get_processor('file_decoder')(samples["sweep.wav"])
    >>> spectrogram = get_processor('spectrogram_lin')(width=400, height=150)
@@ -49,7 +49,7 @@ analysis and encoding:
 .. doctest:: test_3
 
    >>> import timeside
-   >>> from timeside.tools.test_samples import samples
+   >>> from timeside.core.tools.test_samples import samples
    >>> from timeside.core import get_processor
    >>> decoder = get_processor('file_decoder')(samples["sweep.wav"])
    >>> levels = get_processor('level')()

diff --git a/tests/test_analyzer_dc.py b/tests/test_analyzer_dc.py
index 44595af0d2f7fa7c3859902837f7a6c5630822b1..492863b69027113400731691416e7bb9e5756625 100755 (executable)
--- a/tests/test_analyzer_dc.py
+++ b/tests/test_analyzer_dc.py
@@ -3,7 +3,7 @@
 from unit_timeside import unittest, TestRunner
 from timeside.plugins.decoder.file import FileDecoder
 from timeside.plugins.analyzer.dc import MeanDCShift
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 class TestAnalyzerDC(unittest.TestCase):

diff --git a/tests/test_analyzer_level.py b/tests/test_analyzer_level.py
index f63ef2d6ff5b7915fb057633161cc2cf6f32e785..76ef3e2a122d9bae1d5b3af03d96906e342eb2e1 100755 (executable)
--- a/tests/test_analyzer_level.py
+++ b/tests/test_analyzer_level.py
@@ -3,7 +3,7 @@
 from unit_timeside import unittest, TestRunner
 from timeside.plugins.decoder.file import FileDecoder
 from timeside.plugins.analyzer.level import Level
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 class TestAnalyzerLevel(unittest.TestCase):

diff --git a/tests/test_analyzers_default.py b/tests/test_analyzers_default.py
index 9a462aeae3581f6c05f3004b70af124ccb457228..1a65ba4c572ea2336cefd473cb92cc925422e43c 100755 (executable)
--- a/tests/test_analyzers_default.py
+++ b/tests/test_analyzers_default.py
@@ -6,7 +6,7 @@ import numpy as np
 
 import timeside.core
 from timeside.plugins.decoder.file import FileDecoder
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 

diff --git a/tests/test_aubio_melenergy.py b/tests/test_aubio_melenergy.py
index fcda5992dd16fe13cf0c1ed148f5cb25115f62aa..b4ad9a03695e8b978ff81134684ceb1010b1b41d 100755 (executable)
--- a/tests/test_aubio_melenergy.py
+++ b/tests/test_aubio_melenergy.py
@@ -4,7 +4,7 @@ from unit_timeside import unittest, TestRunner
 from timeside.plugins.decoder.file import FileDecoder
 from timeside.core import get_processor
 from timeside.core import _WITH_AUBIO
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 @unittest.skipIf(not _WITH_AUBIO, 'Aubio library is not available')

diff --git a/tests/test_aubio_mfcc.py b/tests/test_aubio_mfcc.py
index 1555b6cfe3e86edad06150c46119557e030b526a..4befba5bcc2535286f5196f5d1e6d79ec1c54d7b 100755 (executable)
--- a/tests/test_aubio_mfcc.py
+++ b/tests/test_aubio_mfcc.py
@@ -4,7 +4,7 @@ from unit_timeside import unittest, TestRunner
 from timeside.plugins.decoder.file import FileDecoder
 from timeside.core import get_processor
 from timeside.core import _WITH_AUBIO
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 @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 ddf526c153174b6a3fa0efdbfd51885b9dfbe245..fd7404f58d34ddcccfa89465cb00f8a72a0110a7 100755 (executable)
--- a/tests/test_aubio_pitch.py
+++ b/tests/test_aubio_pitch.py
@@ -5,7 +5,7 @@ from timeside.plugins.decoder.file import FileDecoder
 from timeside.core import get_processor
 from timeside.core import _WITH_AUBIO
 
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 @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 6378a6fbd864793ef3e5fae3ead80786222e7304..c36440f94286ae3c9ab49e6f70d14a9abc5398c1 100755 (executable)
--- a/tests/test_aubio_specdesc.py
+++ b/tests/test_aubio_specdesc.py
@@ -5,7 +5,7 @@ from timeside.plugins.decoder.file import FileDecoder
 from timeside.core import get_processor
 from timeside.core import _WITH_AUBIO
 
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 @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 fc88530486594a9a6eb7b489e3d4a283952b3854..8ab57db3b462ff76e161e53174c17ba4330f171b 100755 (executable)
--- a/tests/test_aubio_temporal.py
+++ b/tests/test_aubio_temporal.py
@@ -5,7 +5,7 @@ from timeside.plugins.decoder.file import FileDecoder
 from timeside.core import get_processor
 from timeside.core import _WITH_AUBIO
 
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 @unittest.skipIf(not _WITH_AUBIO, 'Aubio library is not available')

diff --git a/tests/test_core_processors.py b/tests/test_core_processors.py
index 59835816be26590dfbce26ac93d6a4fe21636fc6..7cf005da25fb2b9717f10070eddc0248b2914ab9 100644 (file)
--- a/tests/test_core_processors.py
+++ b/tests/test_core_processors.py
@@ -8,7 +8,7 @@ from timeside.core.processor import Processor
 from timeside.core.api import IProcessor
 from timeside.core.component import implements, interfacedoc
 
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 SAMPLE_RATE_FORCED = 16000
 OTHER_SAMPLE_RATE = 32000

diff --git a/tests/test_decoder_utils.py b/tests/test_decoder_utils.py
index c0cac0cdd634e4b82eedeff007b4573b560f6775..adf7d9cad59c41b0080d98df4fbcc7ac3f9a6e05 100755 (executable)
--- a/tests/test_decoder_utils.py
+++ b/tests/test_decoder_utils.py
@@ -6,7 +6,7 @@ from __future__ import division
 
 from unit_timeside import unittest, TestRunner
 from timeside.plugins.decoder.utils import get_uri, get_media_uri_info, path2uri
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 import os.path
 
 

diff --git a/tests/test_decoding.py b/tests/test_decoding.py
index ac217b8561b43fdf9d2beb34234ee8da64958c9c..04ec818b7223af05b2886dccc73a449051974827 100755 (executable)
--- a/tests/test_decoding.py
+++ b/tests/test_decoding.py
@@ -6,7 +6,7 @@ from timeside.plugins.decoder.file import FileDecoder
 from timeside.core.processor import ProcessPipe
 
 from unit_timeside import unittest, TestRunner
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 import os.path
 

diff --git a/tests/test_decoding_stack.py b/tests/test_decoding_stack.py
index 7a917bf8e92d3cd5e142fc38cff2b672d00db567..3ec8f6b1ac891f37771cb93b54cb9cfc486672a3 100755 (executable)
--- a/tests/test_decoding_stack.py
+++ b/tests/test_decoding_stack.py
@@ -6,7 +6,7 @@ from timeside.plugins.decoder.file import FileDecoder
 from timeside.plugins.analyzer.level import Level
 from timeside.core.processor import ProcessPipe
 from unit_timeside import unittest, TestRunner
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 #from glib import GError as GST_IOError
 # HINT : to use later with Gnonlin only

diff --git a/tests/test_graphers_render_analyzers.py b/tests/test_graphers_render_analyzers.py
index f49d3c593dd4973016e96180f725f9360367b921..7390e015ead95189a08e62f29b1cb1eb52d9c56f 100755 (executable)
--- a/tests/test_graphers_render_analyzers.py
+++ b/tests/test_graphers_render_analyzers.py
@@ -3,7 +3,7 @@ from __future__ import division
 
 from unit_timeside import unittest, TestRunner
 import timeside
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 from tempfile import NamedTemporaryFile
 import os
 

diff --git a/tests/test_graphing.py b/tests/test_graphing.py
index 2d26869b640631a74682ff0feaeac140df9b2320..d04fae6dd51d12d50a31d06fe8fb3863bc877d31 100755 (executable)
--- a/tests/test_graphing.py
+++ b/tests/test_graphing.py
@@ -2,7 +2,7 @@
 
 from timeside.plugins.decoder.file import FileDecoder
 from unit_timeside import unittest, TestRunner
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 import tempfile
 import os.path

diff --git a/tests/test_process_pipe.py b/tests/test_process_pipe.py
index df38147f5eb92b5878a4d4fe9119086b390387d6..ed2ef8dfd66111f97196d198339e556311e6c1aa 100755 (executable)
--- a/tests/test_process_pipe.py
+++ b/tests/test_process_pipe.py
@@ -6,7 +6,7 @@
 from unit_timeside import unittest, TestRunner
 import timeside
 from timeside.plugins.decoder.file import FileDecoder
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 class TestProcessPipe(unittest.TestCase):

diff --git a/tests/test_run_all_doctests.py b/tests/test_run_all_doctests.py
index aef1a8a215f326f3cf23ec1f8a76285319db816a..d7a96be1c6469e279312babfbb41c25c6691fed0 100755 (executable)
--- a/tests/test_run_all_doctests.py
+++ b/tests/test_run_all_doctests.py
@@ -24,7 +24,7 @@ import unittest
 from unit_timeside import TestRunner
 import doctest
 import timeside
-from timeside.tools.package import discover_modules
+from timeside.core.tools.package import discover_modules
 
 
 def load_tests(loader, tests, ignore):

diff --git a/tests/test_tools_parameters.py b/tests/test_tools_parameters.py
index 40552aaaa2fd5f4ca09becf7c7782044d1d354a7..4085ff4d9b35e1fcc959e4f796804e00e0ed1128 100755 (executable)
--- a/tests/test_tools_parameters.py
+++ b/tests/test_tools_parameters.py
@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 
 from unit_timeside import unittest, TestRunner
-from timeside.tools.parameters import HasParam, HasTraits
-from timeside.tools.parameters import Unicode, Int, Float, Range
+from timeside.core.tools.parameters import HasParam, HasTraits
+from timeside.core.tools.parameters import Unicode, Int, Float, Range
 
 import simplejson as json
 

diff --git a/tests/test_transcoding.py b/tests/test_transcoding.py
index 7dcda200d36b96feab7b9fd8ff458ebdb3e92f58..0de541344bb7dbbc616e5c814fb20ea1be9ab924 100755 (executable)
--- a/tests/test_transcoding.py
+++ b/tests/test_transcoding.py
@@ -8,7 +8,7 @@ from timeside.plugins.decoder.file import FileDecoder
 import os
 from unit_timeside import unittest, TestRunner
 from tools import tmp_file_sink
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 class TestTranscodingFromWav(unittest.TestCase):

diff --git a/tests/test_transcoding_streaming.py b/tests/test_transcoding_streaming.py
index e3e614ca954ffa54da9c74871720ace418230dd2..dc42bb7f145e4d8a2ab05bbccb38883b8e1675c0 100755 (executable)
--- a/tests/test_transcoding_streaming.py
+++ b/tests/test_transcoding_streaming.py
@@ -7,7 +7,7 @@ from timeside.plugins.decoder.file import FileDecoder
 
 from unit_timeside import unittest, TestRunner
 from tools import tmp_file_sink
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 class TestTranscodingStreaming(unittest.TestCase):

diff --git a/tests/test_vamp_simple_host.py b/tests/test_vamp_simple_host.py
index b78580b3e597fcfc00d3eae98c93e14558a4f002..78dfdc9c8a7d9b99fe5221a025bff8c539955d29 100755 (executable)
--- a/tests/test_vamp_simple_host.py
+++ b/tests/test_vamp_simple_host.py
@@ -4,7 +4,7 @@ from unit_timeside import unittest, TestRunner
 from timeside.plugins.decoder.file import FileDecoder
 from timeside.core import get_processor
 from timeside.core import _WITH_VAMP
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 
 @unittest.skipIf(not _WITH_VAMP, 'vamp-simple-host library is not available')

diff --git a/tests/test_yaafe.py b/tests/test_yaafe.py
index f9fe44084a59d9015c1357a78ee7a005df1c9a76..bdda26d440c51340936bbb27395951a41a7c804c 100755 (executable)
--- a/tests/test_yaafe.py
+++ b/tests/test_yaafe.py
@@ -2,7 +2,7 @@
 
 from unit_timeside import unittest, TestRunner
 from timeside.plugins.decoder.file import FileDecoder
-from timeside.tools.test_samples import samples
+from timeside.core.tools.test_samples import samples
 
 from timeside.core import _WITH_YAAFE
 if _WITH_YAAFE:

diff --git a/timeside/core/__init__.py b/timeside/core/__init__.py
index 364a300f9efce2a716ceaa27195022bf694ebbf1..41f35a9356f81a0f6e41b68dc473e3006d7edc33 100644 (file)
--- a/timeside/core/__init__.py
+++ b/timeside/core/__init__.py
@@ -30,7 +30,7 @@ from .component import implements, interfacedoc, abstract
 
 __version__ = '0.6.2'
 
-from ..tools import package as ts_package
+from .tools import package as ts_package
 
 # Check Availability of Gstreamer python bindings
 ts_package.check_gstreamer()

diff --git a/timeside/core/analyzer.py b/timeside/core/analyzer.py
index f5e6a86511eef30c5c1302afa7a1ca10635cc6a3..f9de7a5032a1bdf1274326131edf2afc2b980f6f 100644 (file)
--- a/timeside/core/analyzer.py
+++ b/timeside/core/analyzer.py
@@ -25,7 +25,7 @@
 from __future__ import division
 
 from .processor import Processor
-from ..tools import hdf5
+from .tools import hdf5
 
 import timeside  # import __version__
 from timeside.core import implements, interfacedoc, abstract

diff --git a/timeside/core/encoder.py b/timeside/core/encoder.py
index 843a53652e720b68c27227c6fc3ed83eff4d7452..aed53381e75d030a42b2464e5d8ad5dfe1ba94a5 100644 (file)
--- a/timeside/core/encoder.py
+++ b/timeside/core/encoder.py
@@ -22,10 +22,9 @@
 # along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from timeside.core import Processor, implements, interfacedoc
-from ..core import abstract
+from timeside.core import Processor, implements, interfacedoc, abstract
 from timeside.core.api import IEncoder
-from timeside.tools.gstutils import numpy_array_to_gst_buffer, MainloopThread
+from .tools.gstutils import numpy_array_to_gst_buffer, MainloopThread
 
 import pygst
 pygst.require('0.10')

diff --git a/timeside/core/processor.py b/timeside/core/processor.py
index 8c6efb395c049c96c312fbaf3678eddf55f07454..1ce10a29c71e0355c851844b056bb580ae57d827 100644 (file)
--- a/timeside/core/processor.py
+++ b/timeside/core/processor.py
@@ -22,7 +22,7 @@ from .component import Component, MetaComponent, abstract
 from .component import implements, implementations, interfacedoc
 from .api import IProcessor
 from .exceptions import Error, PIDError, ApiError
-from ..tools.parameters import HasParam
+from .tools.parameters import HasParam
 
 import re
 import numpy

diff --git a/timeside/core/tools/package.py b/timeside/core/tools/package.py
index a31b887264753648ff00d91335c77dd2f4bcadf6..48adab991d7dfd506d4e9641372d58501641a9c0 100644 (file)
--- a/timeside/core/tools/package.py
+++ b/timeside/core/tools/package.py
@@ -23,7 +23,7 @@
 from importlib import import_module
 import warnings
 
-from ..core.exceptions import VampImportError
+from ..exceptions import VampImportError
 
 def discover_modules(subpackage, package=None):
     import pkgutil
@@ -114,7 +114,6 @@ def check_yaafe():
 
 def check_vamp():
     "Check Vamp host availability"
-    from ..core.exceptions import VampImportError
 
     try:
         from timeside.plugins.analyzer.externals import vamp_plugin

diff --git a/timeside/plugins/analyzer/externals/aubio_pitch.py b/timeside/plugins/analyzer/externals/aubio_pitch.py
index 1c5488c8c5a6bb8cdcab8bbfd93fa386d66ba600..e09d8bd5fa0cce7ce80c0a9c085de8926c1af575 100644 (file)
--- a/timeside/plugins/analyzer/externals/aubio_pitch.py
+++ b/timeside/plugins/analyzer/externals/aubio_pitch.py
@@ -28,7 +28,7 @@ from aubio import pitch
 import numpy as np
 from timeside.plugins.analyzer.utils import nextpow2
 
-from timeside.tools.parameters import Float, HasTraits
+from timeside.core.tools.parameters import Float, HasTraits
 
 
 class AubioPitch(Analyzer):

diff --git a/timeside/plugins/analyzer/externals/vamp_plugin.py b/timeside/plugins/analyzer/externals/vamp_plugin.py
index ebd28391d5449ce8e612cbe7ce8e47acc8ce55c3..4e12c78258d86996e7b248439fc17506dd208016 100644 (file)
--- a/timeside/plugins/analyzer/externals/vamp_plugin.py
+++ b/timeside/plugins/analyzer/externals/vamp_plugin.py
@@ -22,7 +22,7 @@
 from timeside.core import implements, interfacedoc
 from timeside.core.analyzer import Analyzer
 from timeside.core.api import IAnalyzer
-from timeside.tools.parameters import HasTraits, List
+from timeside.core.tools.parameters import HasTraits, List
 
 import subprocess
 import tempfile

diff --git a/timeside/plugins/analyzer/externals/yaafe.py b/timeside/plugins/analyzer/externals/yaafe.py
index 76ab7f485e69a2c7424463a0696000f127de7462..803a57ed378ed34fa438e2d343463be64fa035f3 100644 (file)
--- a/timeside/plugins/analyzer/externals/yaafe.py
+++ b/timeside/plugins/analyzer/externals/yaafe.py
@@ -29,7 +29,7 @@ from timeside.core.api import IAnalyzer
 import yaafelib
 import numpy
 from timeside.core.preprocessors import downmix_to_mono
-from timeside.tools.parameters import HasTraits, ListUnicode, Float
+from timeside.core.tools.parameters import HasTraits, ListUnicode, Float
 
 
 class Yaafe(Analyzer):
@@ -46,7 +46,7 @@ class Yaafe(Analyzer):
     Examples
     --------
     >>> import timeside
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> from timeside.core import get_processor
     >>> source = samples['C4_scale.wav']
     >>> FileDecoder = get_processor('file_decoder')

diff --git a/timeside/plugins/analyzer/level.py b/timeside/plugins/analyzer/level.py
index b2686c0256a7da5d7a2813e4b3a48cbac67408e4..7806926e8f0582206584bb662686f37a36a54c6c 100644 (file)
--- a/timeside/plugins/analyzer/level.py
+++ b/timeside/plugins/analyzer/level.py
@@ -36,7 +36,7 @@ class Level(Analyzer):
 
     >>> import timeside
     >>> from timeside.core import get_processor
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> source = samples['sweep.mp3']
     >>> decoder = get_processor('file_decoder')(uri=source)
     >>> level = get_processor('level')()

diff --git a/timeside/plugins/analyzer/odf.py b/timeside/plugins/analyzer/odf.py
index 4b02798b3b901d832ffde56916bcf39303665f63..423bb1014f2780cd558c2540aa772c5930a6e15b 100644 (file)
--- a/timeside/plugins/analyzer/odf.py
+++ b/timeside/plugins/analyzer/odf.py
@@ -26,7 +26,7 @@ from timeside.core.api import IAnalyzer
 import numpy as np
 from numpy import pi as Pi
 from scipy import signal
-from timeside.tools.parameters import Int, HasTraits
+from timeside.core.tools.parameters import Int, HasTraits
 
 
 class OnsetDetectionFunction(Analyzer):

diff --git a/timeside/plugins/analyzer/spectrogram.py b/timeside/plugins/analyzer/spectrogram.py
index 925e30f1fddd1465410f2d1825b58d2014706606..ee55b6f4667cdb40e7794f533643cc59819ee7ee 100644 (file)
--- a/timeside/plugins/analyzer/spectrogram.py
+++ b/timeside/plugins/analyzer/spectrogram.py
@@ -23,8 +23,8 @@ from timeside.core import implements, interfacedoc
 from timeside.core.analyzer import Analyzer
 from timeside.core.api import IAnalyzer
 from timeside.core.preprocessors import downmix_to_mono, frames_adapter
-from timeside.tools.buffering import BufferTable
-from timeside.tools.parameters import Int, HasTraits
+from timeside.core.tools.buffering import BufferTable
+from timeside.core.tools.parameters import Int, HasTraits
 
 import numpy as np
 
@@ -47,7 +47,7 @@ class Spectrogram(Analyzer):
     --------
     >>> import timeside
     >>> from timeside.core import get_processor
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> audio_source = samples['sweep.wav']
     >>> decoder = get_processor('file_decoder')(uri=audio_source)
     >>> spectrogram = get_processor('spectrogram_analyzer')(input_blocksize=2048, input_stepsize=1024)
@@ -63,7 +63,7 @@ class Spectrogram(Analyzer):
 
       import timeside
       from timeside.core import get_processor
-      from timeside.tools.test_samples import samples
+      from timeside.core.tools.test_samples import samples
       audio_source = samples['sweep.wav']
       decoder = get_processor('file_decoder')(uri=audio_source)
       spectrogram = get_processor('spectrogram_analyzer')(input_blocksize=2048,

diff --git a/timeside/plugins/analyzer/spectrogram_buffer.py b/timeside/plugins/analyzer/spectrogram_buffer.py
index 0b8a135ccdf5b9a24e86bc906e4831323f33d769..1923d61465d2eb07adcc9f7abc0abbf6c793a033 100644 (file)
--- a/timeside/plugins/analyzer/spectrogram_buffer.py
+++ b/timeside/plugins/analyzer/spectrogram_buffer.py
@@ -25,8 +25,8 @@ from timeside.core import implements, interfacedoc
 from timeside.core.analyzer import Analyzer
 from timeside.core.api import IAnalyzer
 from timeside.core.preprocessors import downmix_to_mono, frames_adapter
-from timeside.tools.parameters import Int, HasTraits
-from timeside.tools.buffering import BufferTable
+from timeside.core.tools.parameters import Int, HasTraits
+from timeside.core.tools.buffering import BufferTable
 from timeside.plugins.analyzer.spectrogram import Spectrogram
 
 import numpy as np
@@ -49,7 +49,7 @@ class SpectrogramBuffer(Spectrogram):
     --------
     >>> import timeside
     >>> from timeside.core import get_processor
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> audio_source = samples['sweep.wav']
     >>> decoder = get_processor('file_decoder')(uri=audio_source)
     >>> spectrogram = get_processor('spectrogram_analyzer_buffer')(input_blocksize=2048, input_stepsize=1024)
@@ -65,7 +65,7 @@ class SpectrogramBuffer(Spectrogram):
 
       import timeside
       from timeside.core import get_processor
-      from timeside.tools.test_samples import samples
+      from timeside.core.tools.test_samples import samples
       audio_source = samples['sweep.wav']
       decoder = get_processor('file_decoder')(uri=audio_source)
       spectrogram = get_processor('spectrogram_analyzer_buffer')(input_blocksize=2048,

diff --git a/timeside/plugins/decoder/file.py b/timeside/plugins/decoder/file.py
index 36599111d22a50962a1d747791a38695b0098ae5..3cd21d3c5f9a546032b3df01719b195037cdeb6e 100644 (file)
--- a/timeside/plugins/decoder/file.py
+++ b/timeside/plugins/decoder/file.py
@@ -31,8 +31,8 @@
 from __future__ import division
 
 from timeside.core.decoder import Decoder, IDecoder, implements, interfacedoc
-from timeside.tools.gstutils import MainloopThread, gobject
-from timeside.tools.gstutils import gst_buffer_to_numpy_array
+from timeside.core.tools.gstutils import MainloopThread, gobject
+from timeside.core.tools.gstutils import gst_buffer_to_numpy_array
 import threading
 
 from timeside.plugins.decoder.utils import get_uri, get_media_uri_info, stack, get_sha1
@@ -67,7 +67,7 @@ class FileDecoder(Decoder):
     --------
     >>> import timeside
     >>> from timeside.core import get_processor
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> audio_source = samples['sweep.wav']
     >>> FileDecoder = get_processor('file_decoder')  # Get the decoder class
     >>> # Use decoder with default parameters

diff --git a/timeside/plugins/decoder/live.py b/timeside/plugins/decoder/live.py
index ee97232364732e5a61fafefde5efbcc66b3e9a13..dbff592cc3a68b92578700629bd7284db3d5bc67 100644 (file)
--- a/timeside/plugins/decoder/live.py
+++ b/timeside/plugins/decoder/live.py
@@ -29,7 +29,7 @@
 from __future__ import division
 
 from timeside.core.decoder import Decoder, IDecoder, interfacedoc, implements
-from timeside.tools.gstutils import MainloopThread, gobject
+from timeside.core.tools.gstutils import MainloopThread, gobject
 from timeside.plugins.decoder.file import FileDecoder
 import Queue
 import threading

diff --git a/timeside/plugins/decoder/utils.py b/timeside/plugins/decoder/utils.py
index b021f13ffb4a33f7e1e6a0a139fec4c689fd095f..3468636e1af6a8390c99ecbb399b2805f357d19e 100644 (file)
--- a/timeside/plugins/decoder/utils.py
+++ b/timeside/plugins/decoder/utils.py
@@ -181,7 +181,7 @@ def sha1sum_file(filename):
     '''
     Return the secure hash digest with sha1 algorithm for a given file
 
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> wav_file = samples["C4_scale.wav"]
     >>> print sha1sum_file(wav_file)
     a598e78d0b5c90da54a77e34c083abdcd38d42ba

diff --git a/timeside/plugins/encoder/audiosink.py b/timeside/plugins/encoder/audiosink.py
index 3b3c9e664db9adbec3896a3489f80932b094348e..9bf4cc7c7d0cc88cebe744760ad44a3252c6eb5b 100644 (file)
--- a/timeside/plugins/encoder/audiosink.py
+++ b/timeside/plugins/encoder/audiosink.py
@@ -47,7 +47,7 @@ class AudioSink(GstEncoder):
 
     >>> import timeside
     >>> from timeside.core import get_processor
-    >>> from timeside.tools.test_samples import samples
+    >>> from timeside.core.tools.test_samples import samples
     >>> wav_file = samples['sine440Hz_mono_1s.wav']
     >>> d = get_processor('file_decoder')(wav_file)
     >>> e = get_processor('live_encoder')()