Remove superfluous ..plugin from imports in hooke.plugin.*

diff --git a/hooke/plugin/command_stack.py b/hooke/plugin/command_stack.py
index ab75ce40182cafb785a883c84e408a024c10681b..5552c7ef7ed879e596d2fb363b7dbfacbe1fd24c 100644 (file)
--- a/hooke/plugin/command_stack.py
+++ b/hooke/plugin/command_stack.py
@@ -24,7 +24,7 @@ and several associated :class:`~hooke.command.Command`\s exposing
 """
 
 from ..command import Command, Argument, Failure
 """
 
 from ..command import Command, Argument, Failure

-from ..plugin import Builtin
+from . import Builtin

 from .curve import CurveCommand
 
 class macroCommands(object):
 from .curve import CurveCommand
 
 class macroCommands(object):

diff --git a/hooke/plugin/config.py b/hooke/plugin/config.py
index aa689a9467d704a8942c54130f000fb88397924c..5820dd7e1bead2eda4a127fca2543b25ec71250e 100644 (file)
--- a/hooke/plugin/config.py
+++ b/hooke/plugin/config.py
@@ -25,7 +25,7 @@ from StringIO import StringIO
 
 from ..command import Command, Argument, Failure
 from ..interaction import ReloadUserInterfaceConfig
 
 from ..command import Command, Argument, Failure
 from ..interaction import ReloadUserInterfaceConfig

-from ..plugin import Builtin
+from . import Builtin

 
 
 class ConfigPlugin (Builtin):
 
 
 class ConfigPlugin (Builtin):

diff --git a/hooke/plugin/convfilt.py b/hooke/plugin/convfilt.py
index b8d967ae6be224b92d1252af6bd0503e0219b84d..1c8124fbcb9d955d55fd07516ba96c6834f1a5f8 100644 (file)
--- a/hooke/plugin/convfilt.py
+++ b/hooke/plugin/convfilt.py
@@ -41,12 +41,12 @@ import numpy
 from ..command import Command, Argument, Success, Failure
 from ..config import Setting
 from ..experiment import VelocityClamp
 from ..command import Command, Argument, Success, Failure
 from ..config import Setting
 from ..experiment import VelocityClamp

-from ..plugin import Plugin, argument_to_setting
-from ..plugin.curve import CurveArgument
-from ..plugin.playlist import FilterCommand
-from ..plugin.vclamp import scale

 from ..util.fit import PoorFit
 from ..util.peak import find_peaks, find_peaks_arguments, Peak, _kwargs
 from ..util.fit import PoorFit
 from ..util.peak import find_peaks, find_peaks_arguments, Peak, _kwargs

+from . import Plugin, argument_to_setting
+from .curve import CurveArgument
+from .playlist import FilterCommand
+from .vclamp import scale

 
 
 class ConvFiltPlugin (Plugin):
 
 
 class ConvFiltPlugin (Plugin):

diff --git a/hooke/plugin/curve.py b/hooke/plugin/curve.py
index e5a12aec3dc81971967f0f1920e53f080fca0348..f0d847cf6ff6e41363139293eefd46ad40b0dbc2 100644 (file)
--- a/hooke/plugin/curve.py
+++ b/hooke/plugin/curve.py
@@ -30,11 +30,11 @@ import numpy
 
 from ..command import Command, Argument, Failure
 from ..curve import Data
 
 from ..command import Command, Argument, Failure
 from ..curve import Data

-from ..plugin import Builtin
-from ..plugin.playlist import current_playlist_callback

 from ..util.calculus import derivative
 from ..util.fft import unitary_avg_power_spectrum
 from ..util.si import ppSI, join_data_label, split_data_label
 from ..util.calculus import derivative
 from ..util.fft import unitary_avg_power_spectrum
 from ..util.si import ppSI, join_data_label, split_data_label

+from . import Builtin
+from .playlist import current_playlist_callback

 
 
 # Define common or complicated arguments
 
 
 # Define common or complicated arguments

diff --git a/hooke/plugin/cut.py b/hooke/plugin/cut.py
index ad1a0679a00781f790964db28a7dbdab2a831ea1..5d7d79c0e7eae4d7d30b5716c399aa75736b32c1 100644 (file)
--- a/hooke/plugin/cut.py
+++ b/hooke/plugin/cut.py
@@ -25,7 +25,7 @@
 import numpy
 
 from ..command import Command, Argument, Failure
 import numpy
 
 from ..command import Command, Argument, Failure

-from ..plugin import Plugin
+from . import Plugin

 
 
 class CutPlugin (Plugin):
 
 
 class CutPlugin (Plugin):

diff --git a/hooke/plugin/debug.py b/hooke/plugin/debug.py
index 1855450d4d3293ecd6b33d05bba95e48afa7179a..a66fb3b804adc15c3752fbb8e76d634a8b1ec033 100644 (file)
--- a/hooke/plugin/debug.py
+++ b/hooke/plugin/debug.py
@@ -26,7 +26,7 @@ import sys
 
 from .. import version
 from ..command import Command, Argument
 
 from .. import version
 from ..command import Command, Argument

-from ..plugin import Builtin
+from . import Builtin

 
 
 class DebugPlugin (Builtin):
 
 
 class DebugPlugin (Builtin):

diff --git a/hooke/plugin/flatfilt.py b/hooke/plugin/flatfilt.py
index 429a2dcc362e8b633a7e18cbd5b9ef02c8638e79..08c5fa5b829546d8c52d9508c6950357592371a6 100644 (file)
--- a/hooke/plugin/flatfilt.py
+++ b/hooke/plugin/flatfilt.py
@@ -42,13 +42,13 @@ from ..command import Argument, Success, Failure, UncaughtException
 from ..config import Setting
 from ..curve import Data
 from ..experiment import VelocityClamp
 from ..config import Setting
 from ..curve import Data
 from ..experiment import VelocityClamp

-from ..plugin import Plugin, argument_to_setting
-from ..plugin.curve import ColumnAddingCommand
-from ..plugin.playlist import FilterCommand

 from ..util.fit import PoorFit
 from ..util.peak import (find_peaks, peaks_to_mask,
                          find_peaks_arguments, Peak, _kwargs)
 from ..util.si import join_data_label, split_data_label
 from ..util.fit import PoorFit
 from ..util.peak import (find_peaks, peaks_to_mask,
                          find_peaks_arguments, Peak, _kwargs)
 from ..util.si import join_data_label, split_data_label

+from . import Plugin, argument_to_setting
+from .curve import ColumnAddingCommand
+from .playlist import FilterCommand

 
 
 class FlatFiltPlugin (Plugin):
 
 
 class FlatFiltPlugin (Plugin):

diff --git a/hooke/plugin/license.py b/hooke/plugin/license.py
index 21fecdb3da8f61d6a7ca18d0710c0b0e2b530246..50b3a9235aec924de3d0e9d2352001aa76f1b3ce 100644 (file)
--- a/hooke/plugin/license.py
+++ b/hooke/plugin/license.py
@@ -23,7 +23,7 @@ licensing information.
 
 from .. import __license__
 from ..command import Command, Argument, Failure
 
 from .. import __license__
 from ..command import Command, Argument, Failure

-from ..plugin import Builtin
+from . import Builtin

 
 
 class LicensePlugin (Builtin):
 
 
 class LicensePlugin (Builtin):

diff --git a/hooke/plugin/multifit.py b/hooke/plugin/multifit.py
index 73924184d0d2ba07550afcc84a75e0f2fa61b68a..f3a78c1f7867cdea775a2aa040f25238d4e33ba8 100644 (file)
--- a/hooke/plugin/multifit.py
+++ b/hooke/plugin/multifit.py
@@ -24,8 +24,8 @@ all sorts of :class:`hooke.experiment.VelocityClamp` parameters.
 
 from ..command import Command, Argument, Failure
 from ..playlist import FilePlaylist
 
 from ..command import Command, Argument, Failure
 from ..playlist import FilePlaylist

-from ..plugin import Plugin
-from ..plugin.playlist import PlaylistArgument
+from . import Plugin
+from .playlist import PlaylistArgument

 
 
 class MultifitPlugin (Plugin):
 
 
 class MultifitPlugin (Plugin):

diff --git a/hooke/plugin/note.py b/hooke/plugin/note.py
index eebf8c6368f2f48d6d95422110a35a7b4e3e7cb7..fa699be7306f9b4de974a55d28c8a54cbb345242 100644 (file)
--- a/hooke/plugin/note.py
+++ b/hooke/plugin/note.py
@@ -22,8 +22,8 @@
 """
 
 from ..command import Command, Argument, Failure
 """
 
 from ..command import Command, Argument, Failure

-from ..plugin import Builtin
-from ..plugin.curve import current_curve_callback
+from . import Builtin
+from .curve import current_curve_callback

 
 
 class NotePlugin (Builtin):
 
 
 class NotePlugin (Builtin):

diff --git a/hooke/plugin/playlist.py b/hooke/plugin/playlist.py
index 9f0d9e15674abdd79c21a3587ebae183aa18b18e..a9247011c23afdfe5ad3bf93a64d0222c4a34c36 100644 (file)
--- a/hooke/plugin/playlist.py
+++ b/hooke/plugin/playlist.py
@@ -26,7 +26,7 @@ import os.path
 
 from ..command import Command, Argument, Failure
 from ..playlist import FilePlaylist
 
 from ..command import Command, Argument, Failure
 from ..playlist import FilePlaylist

-from ..plugin import Builtin
+from . import Builtin

 
 
 class PlaylistPlugin (Builtin):
 
 
 class PlaylistPlugin (Builtin):

diff --git a/hooke/plugin/playlists.py b/hooke/plugin/playlists.py
index 8de9ec1f643323d5fa1fb555f9e1203dcbda2665..c04f0ba1baa13d86f886b5df9a3029c6a9205d59 100644 (file)
--- a/hooke/plugin/playlists.py
+++ b/hooke/plugin/playlists.py
@@ -23,7 +23,7 @@ lists of :class:`hooke.playlist.Playlist` classes.
 
 from ..command import Command, Argument, Failure
 from ..playlist import FilePlaylist
 
 from ..command import Command, Argument, Failure
 from ..playlist import FilePlaylist

-from ..plugin import Builtin
+from . import Builtin

 from .playlist import PlaylistNameArgument
 
 
 from .playlist import PlaylistNameArgument
 
 

diff --git a/hooke/plugin/polymer_fit.py b/hooke/plugin/polymer_fit.py
index 2ea503c58af398687463711674397e23b4008537..9ee0c533e37d2053f187747d3872cd6f646a0cfd 100644 (file)
--- a/hooke/plugin/polymer_fit.py
+++ b/hooke/plugin/polymer_fit.py
@@ -37,11 +37,11 @@ from scipy.optimize import newton
 from ..command import Command, Argument, Success, Failure
 from ..config import Setting
 from ..curve import Data
 from ..command import Command, Argument, Success, Failure
 from ..config import Setting
 from ..curve import Data

-from ..plugin import Plugin, argument_to_setting

 from ..util.callback import is_iterable
 from ..util.fit import PoorFit, ModelFitter
 from ..util.peak import Peak
 from ..util.si import join_data_label, split_data_label
 from ..util.callback import is_iterable
 from ..util.fit import PoorFit, ModelFitter
 from ..util.peak import Peak
 from ..util.si import join_data_label, split_data_label

+from . import Plugin, argument_to_setting

 from .curve import CurveArgument
 from .vclamp import scale
 
 from .curve import CurveArgument
 from .vclamp import scale
 

diff --git a/hooke/plugin/system.py b/hooke/plugin/system.py
index 84f9ee6f7fa2883f66239fd97ff17230ccde0e8c..3d4c7262e265de00083e15c0a7b7839bfbf7c7cc 100644 (file)
--- a/hooke/plugin/system.py
+++ b/hooke/plugin/system.py
@@ -27,7 +27,7 @@ import subprocess
 import sys
 
 from ..command import Command, Argument
 import sys
 
 from ..command import Command, Argument

-from ..plugin import Builtin
+from . import Builtin

 
 
 class SystemPlugin (Builtin):
 
 
 class SystemPlugin (Builtin):

diff --git a/hooke/plugin/vclamp.py b/hooke/plugin/vclamp.py
index 77e3387fe37f0924d4434e166e29916223214683..9f3f6d6454d62e76a2af66eec5ec852381509732 100644 (file)
--- a/hooke/plugin/vclamp.py
+++ b/hooke/plugin/vclamp.py
@@ -34,9 +34,9 @@ import scipy
 from ..command import Argument, Failure, NullQueue
 from ..config import Setting
 from ..curve import Data
 from ..command import Argument, Failure, NullQueue
 from ..config import Setting
 from ..curve import Data

-from ..plugin import Plugin

 from ..util.fit import PoorFit, ModelFitter
 from ..util.si import join_data_label, split_data_label
 from ..util.fit import PoorFit, ModelFitter
 from ..util.si import join_data_label, split_data_label

+from . import Plugin

 from .curve import ColumnAddingCommand
 
 
 from .curve import ColumnAddingCommand