From: Plamen Dimitrov Date: Thu, 28 Apr 2022 06:13:08 +0000 (+0300) Subject: Drop localized dialout cnfvar complexity for the easier cnf store X-Git-Tag: v1.7.1~3^2~3 X-Git-Url: http://developer.intra2net.com/git/?p=pyi2ncommon;a=commitdiff_plain;h=46a11f187a3f1fb8cb4d370d126eb583c59f3d51 Drop localized dialout cnfvar complexity for the easier cnf store This is the final step towards a fully adapted dialout module and gets rid simultaneously of outdated arnied cnfvar calls as well as outdated cnf structure parsing in the new cnfvar API, both of which will follow next. --- diff --git a/src/dial.py b/src/dial.py index 1b53fa9..0458f13 100644 --- a/src/dial.py +++ b/src/dial.py @@ -65,7 +65,6 @@ import time import logging log = logging.getLogger('pyi2ncommon.dial') -from . import arnied_wrapper from . import cnfvar from . import sysmisc @@ -175,10 +174,12 @@ def arnied_dial_permanent(prid="P1", block=False): ("dialout_defaultprovider_ref", "1")]) def aux(): - return arnied_wrapper.set_cnf_pipe(cnf.to_cnf_structure(), block=block), "", None + store = cnfvar.BinaryCnfStore() + store.commit(cnf) + return True, "", None if block is False: - succ = aux() + succ, out, _ = aux() return sysmisc.RUN_RESULT_OK if succ is True else sysmisc.RUN_RESULT_FAIL res, err = sysmisc.cmd_block_till(aux, DIALTOOLS_TIMEOUT, _connd_online,