migrated secop_psi drivers to new syntax

- includes all changes up to 'fix inheritance order' from git_mlz
  6a32ecf342

Change-Id: Ie3ceee3dbd0a9284b47b1d5b5dbe262eebe8f283

test/test_iohandler.py

@@ -23,10 +23,11 @@
 
 import pytest
 
+from secop.datatypes import FloatRange, IntRange, Property, StringType
+from secop.errors import ProgrammingError
 from secop.iohandler import CmdParser, IOHandler
 from secop.modules import Module, Parameter
-from secop.datatypes import FloatRange, StringType, IntRange, Property
-from secop.errors import ProgrammingError
+
 
 @pytest.mark.parametrize('fmt, text, values, text2', [
         ('%d,%d', '2,3', [2,3], None),
@@ -107,15 +108,11 @@ def test_IOHandler():
 
 
     class Module1(Module):
-        properties = {
-            'channel': Property('the channel', IntRange(), default=3),
-            'loop': Property('the loop', IntRange(), default=2),
-        }
-        parameters = {
-            'simple': Parameter('a readonly', FloatRange(), default=0.77, handler=group1),
-            'real': Parameter('a float value', FloatRange(), default=12.3, handler=group2, readonly=False),
-            'text': Parameter('a string value', StringType(), default='x', handler=group2, readonly=False),
-        }
+        channel = Property('the channel', IntRange(), default=3)
+        loop = Property('the loop', IntRange(), default=2)
+        simple = Parameter('a readonly', FloatRange(), default=0.77, handler=group1)
+        real = Parameter('a float value', FloatRange(), default=12.3, handler=group2, readonly=False)
+        text = Parameter('a string value', StringType(), default='x', handler=group2, readonly=False)
 
         def sendRecv(self, command):
             assert data.pop('command') == command
@@ -196,6 +193,4 @@ def test_IOHandler():
     with pytest.raises(ProgrammingError): # can not use a handler for different modules
         # pylint: disable=unused-variable
         class Module2(Module):
-            parameters = {
-                'simple': Parameter('a readonly', FloatRange(), default=0.77, handler=group1),
-            }
+            simple = Parameter('a readonly', FloatRange(), default=0.77, handler=group1)