Rename cnfvar module to cnfvar_old

[pyi2ncommon] / src / arnied_wrapper.py

diff --git a/src/arnied_wrapper.py b/src/arnied_wrapper.py
index 4d13c4c..e8ee70e 100644 (file)
--- a/src/arnied_wrapper.py
+++ b/src/arnied_wrapper.py
@@ -55,7 +55,7 @@ import logging
 log = logging.getLogger('pyi2ncommon.arnied_wrapper')
 
 from .cnfline import build_cnfvar
-from . import cnfvar
+from . import cnfvar_old
 from . import sysmisc
 
 
@@ -495,16 +495,16 @@ def get_cnfvar(varname=None, instance=None, data=None, timeout=30, vm=None):
         # the output of "get_cnf" (no json) which is latin1.
         if isinstance(raw, bytes):
             raw = raw.decode("utf-8")
-        cnf = cnfvar.read_cnf_json(raw)
+        cnf = cnfvar_old.read_cnf_json(raw)
     except TypeError as exn:
         log.info("error \"%s\" parsing result of \"%s\"", exn, cmd_line)
         return None
-    except cnfvar.InvalidCNF as exn:
+    except cnfvar_old.InvalidCNF as exn:
         log.info("error \"%s\" validating result of \"%s\"", exn, cmd_line)
         return None
 
     if data is not None:
-        return cnfvar.get_vars(cnf, data=data)
+        return cnfvar_old.get_vars(cnf, data=data)
 
     return cnf
 
@@ -680,9 +680,9 @@ def set_cnf_dynamic(cnf, config_file=None, kind="cnf", timeout=30, vm=None):
     fd = open(config_path, "wb")
     try:
         SET_CNF_METHODS = {
-            "raw": cnfvar.write_cnf_raw,
-            "json": cnfvar.write_cnf_json,
-            "cnf": cnfvar.write_cnf
+            "raw": cnfvar_old.write_cnf_raw,
+            "json": cnfvar_old.write_cnf_json,
+            "cnf": cnfvar_old.write_cnf
         }
         SET_CNF_METHODS[kind](cnf, out=fd)
     except KeyError: