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

[hooke.git] / hooke / plugin / curve.py

diff --git a/hooke/plugin/curve.py b/hooke/plugin/curve.py
index 308124b2549fd541a774d9c1a9ba6dbc3eff5931..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 ..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
@@ -161,7 +161,12 @@ class ColumnAccessCommand (BlockCommand):
             column_name = self._column_arguments[0].name
         column_name = params[column_name]
         block = self._block(hooke, params, block_name)
-        column_index = block.info['columns'].index(column_name)
+        columns = block.info['columns']
+        try:
+            column_index = columns.index(column_name)
+        except ValueError, e:
+            raise Failure('%s not in %s (%s): %s'
+                          % (column_name, block.info['name'], columns, e))
         return block[:,column_index]