Clean references to resource

Traces from a previous implementation that read configuration
dictionaries from resource files are present in docstrings, arg names
and module names. Change them to be coherent with current
implementation (in which conf dicts are imported from a module).

3 files changed, 14 insertions, 17 deletions

diff --git a/src/sardana/pool/test/__init__.py b/src/sardana/pool/test/__init__.py
index c7430ab8..de63f8ba 100644
--- a/src/sardana/pool/test/__init__.py
+++ b/src/sardana/pool/test/__init__.py
@@ -27,4 +27,4 @@
 
 from .fake import *
 from .helper import *
-from .res import *
+from .dummyconfs import *
diff --git a/src/sardana/pool/test/res.py b/src/sardana/pool/test/dummyconfs.py
index 7f5f4790..7f5f4790 100644
--- a/src/sardana/pool/test/res.py
+++ b/src/sardana/pool/test/dummyconfs.py
diff --git a/src/sardana/pool/test/helper.py b/src/sardana/pool/test/helper.py
index cef17f7b..3525c015 100644
--- a/src/sardana/pool/test/helper.py
+++ b/src/sardana/pool/test/helper.py
@@ -30,36 +30,33 @@ from sardana.pool.poolcontroller import PoolController
 from sardana.pool.poolcountertimer import PoolCounterTimer
 from sardana.pool.poolmeasurementgroup import PoolMeasurementGroup
 
-def createPoolController(pool, res):
-    '''Method to create a PoolController using a resource file
+def createPoolController(pool, conf):
+    '''Method to create a PoolController using a configuration dictionary
     '''
-    args = ()
-    kwargs = res
+    kwargs = conf
 
     ctrl_manager = pool.ctrl_manager
     ctrl_class_info = None
     ctrl_lib_info = ctrl_manager.getControllerLib(kwargs['library'])
     if ctrl_lib_info is not None:
-       ctrl_class_info = ctrl_lib_info.get_controller(kwargs['klass'])
+        ctrl_class_info = ctrl_lib_info.get_controller(kwargs['klass'])
 
     kwargs['pool'] = pool
     kwargs['lib_info'] = ctrl_lib_info
     kwargs['class_info'] = ctrl_class_info
-    return PoolController(*args, **kwargs)
+    return PoolController(**kwargs)
 
-def createPoolCounterTimer(pool, poolcontroller, res):
-    '''Method to create a PoolCounterTimer using a resource file
+def createPoolCounterTimer(pool, poolcontroller, conf):
+    '''Method to create a PoolCounterTimer using a configuration dictionary
     '''
-    args = ()
-    kwargs = res
+    kwargs = conf
     kwargs['pool'] = pool
     kwargs['ctrl'] = poolcontroller
-    return PoolCounterTimer(*args, **kwargs)
+    return PoolCounterTimer(**kwargs)
 
-def createPoolMeasurementGroup(pool, res):
-    '''Method to create a PoolMeasurementGroup using a resource file
+def createPoolMeasurementGroup(pool, conf):
+    '''Method to create a PoolMeasurementGroup using a configuration dictionary
     '''
-    args = ()
-    kwargs = res
+    kwargs = conf
     kwargs['pool'] = pool
-    return PoolMeasurementGroup(*args, **kwargs)
+    return PoolMeasurementGroup(**kwargs)