From 275b19d8224c433ad494f47504840185bec988f3 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 12 Aug 2010 07:31:09 -0400 Subject: [PATCH] Remove superfluous ..plugin from imports in hooke.plugin.* --- hooke/plugin/command_stack.py | 2 +- hooke/plugin/config.py | 2 +- hooke/plugin/convfilt.py | 8 ++++---- hooke/plugin/curve.py | 4 ++-- hooke/plugin/cut.py | 2 +- hooke/plugin/debug.py | 2 +- hooke/plugin/flatfilt.py | 6 +++--- hooke/plugin/license.py | 2 +- hooke/plugin/multifit.py | 4 ++-- hooke/plugin/note.py | 4 ++-- hooke/plugin/playlist.py | 2 +- hooke/plugin/playlists.py | 2 +- hooke/plugin/polymer_fit.py | 2 +- hooke/plugin/system.py | 2 +- hooke/plugin/vclamp.py | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/hooke/plugin/command_stack.py b/hooke/plugin/command_stack.py index ab75ce4..5552c7e 100644 --- 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 ..plugin import Builtin +from . import Builtin from .curve import CurveCommand class macroCommands(object): diff --git a/hooke/plugin/config.py b/hooke/plugin/config.py index aa689a9..5820dd7 100644 --- 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 ..plugin import Builtin +from . import Builtin class ConfigPlugin (Builtin): diff --git a/hooke/plugin/convfilt.py b/hooke/plugin/convfilt.py index b8d967a..1c8124f 100644 --- 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 ..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 . import Plugin, argument_to_setting +from .curve import CurveArgument +from .playlist import FilterCommand +from .vclamp import scale class ConvFiltPlugin (Plugin): diff --git a/hooke/plugin/curve.py b/hooke/plugin/curve.py index e5a12ae..f0d847c 100644 --- 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 ..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 . import Builtin +from .playlist import current_playlist_callback # Define common or complicated arguments diff --git a/hooke/plugin/cut.py b/hooke/plugin/cut.py index ad1a067..5d7d79c 100644 --- a/hooke/plugin/cut.py +++ b/hooke/plugin/cut.py @@ -25,7 +25,7 @@ import numpy from ..command import Command, Argument, Failure -from ..plugin import Plugin +from . import Plugin class CutPlugin (Plugin): diff --git a/hooke/plugin/debug.py b/hooke/plugin/debug.py index 1855450..a66fb3b 100644 --- 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 ..plugin import Builtin +from . import Builtin class DebugPlugin (Builtin): diff --git a/hooke/plugin/flatfilt.py b/hooke/plugin/flatfilt.py index 429a2dc..08c5fa5 100644 --- 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 ..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 . import Plugin, argument_to_setting +from .curve import ColumnAddingCommand +from .playlist import FilterCommand class FlatFiltPlugin (Plugin): diff --git a/hooke/plugin/license.py b/hooke/plugin/license.py index 21fecdb..50b3a92 100644 --- 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 ..plugin import Builtin +from . import Builtin class LicensePlugin (Builtin): diff --git a/hooke/plugin/multifit.py b/hooke/plugin/multifit.py index 7392418..f3a78c1 100644 --- 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 ..plugin import Plugin -from ..plugin.playlist import PlaylistArgument +from . import Plugin +from .playlist import PlaylistArgument class MultifitPlugin (Plugin): diff --git a/hooke/plugin/note.py b/hooke/plugin/note.py index eebf8c6..fa699be 100644 --- a/hooke/plugin/note.py +++ b/hooke/plugin/note.py @@ -22,8 +22,8 @@ """ 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): diff --git a/hooke/plugin/playlist.py b/hooke/plugin/playlist.py index 9f0d9e1..a924701 100644 --- 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 ..plugin import Builtin +from . import Builtin class PlaylistPlugin (Builtin): diff --git a/hooke/plugin/playlists.py b/hooke/plugin/playlists.py index 8de9ec1..c04f0ba 100644 --- 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 ..plugin import Builtin +from . import Builtin from .playlist import PlaylistNameArgument diff --git a/hooke/plugin/polymer_fit.py b/hooke/plugin/polymer_fit.py index 2ea503c..9ee0c53 100644 --- 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 ..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 . import Plugin, argument_to_setting from .curve import CurveArgument from .vclamp import scale diff --git a/hooke/plugin/system.py b/hooke/plugin/system.py index 84f9ee6..3d4c726 100644 --- a/hooke/plugin/system.py +++ b/hooke/plugin/system.py @@ -27,7 +27,7 @@ import subprocess import sys from ..command import Command, Argument -from ..plugin import Builtin +from . import Builtin class SystemPlugin (Builtin): diff --git a/hooke/plugin/vclamp.py b/hooke/plugin/vclamp.py index 77e3387..9f3f6d6 100644 --- 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 ..plugin import Plugin from ..util.fit import PoorFit, ModelFitter from ..util.si import join_data_label, split_data_label +from . import Plugin from .curve import ColumnAddingCommand -- 2.26.2