merge tools/parametrs.py from diadems into dev

diff --git a/timeside/tools/parameters.py b/timeside/tools/parameters.py
index 11503d6e391682e88aef5df07fb46db597281cc2..3101abb9dbd47e9a8a79af17db2f11ea24b7a9b7 100644 (file)
--- a/timeside/tools/parameters.py
+++ b/timeside/tools/parameters.py
@@ -23,7 +23,7 @@
 
 
 from traits.api import HasTraits, Unicode, Int, Float, Range, Enum
-from traits.api import ListUnicode, List
+from traits.api import ListUnicode, List, Tuple
 from traits.api import TraitError
 
 import simplejson as json