Drop previous simple cnf module and class throughout the codebase

[pyi2ncommon] / src / dial.py

diff --git a/src/dial.py b/src/dial.py
index a87117e..1b53fa9 100644 (file)
--- a/src/dial.py
+++ b/src/dial.py
@@ -66,7 +66,7 @@ import logging
 log = logging.getLogger('pyi2ncommon.dial')
 
 from . import arnied_wrapper
-from . import simple_cnf
+from . import cnfvar
 from . import sysmisc
 
 HAVE_IPADDRESS = True
@@ -171,12 +171,11 @@ def arnied_dial_permanent(prid="P1", block=False):
     """
     log.debug("requested connd_dial_online%s" % " (blocking)" if block else "")
 
-    cnf = simple_cnf.SimpleCnf()
-    cnf.add("DIALOUT_MODE", DIALOUT_MODE_CNF[DIALOUT_MODE_PERMANENT])
-    cnf.add("DIALOUT_DEFAULTPROVIDER_REF", "1")
+    cnf = cnfvar.CnfList([("dialout_mode", DIALOUT_MODE_CNF[DIALOUT_MODE_PERMANENT]),
+                          ("dialout_defaultprovider_ref", "1")])
 
     def aux():
-        return arnied_wrapper.set_cnf_pipe(cnf, block=block), "", None
+        return arnied_wrapper.set_cnf_pipe(cnf.to_cnf_structure(), block=block), "", None
 
     if block is False:
         succ = aux()