From 1df5bd87e04f08850808d0359bb0b72f2b55014d Mon Sep 17 00:00:00 2001 From: r00t Date: Tue, 15 May 2018 08:41:58 -0400 Subject: [PATCH] testing some stuff --- bdisk/utils.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/bdisk/utils.py b/bdisk/utils.py index fa1f1f9..fa5605a 100644 --- a/bdisk/utils.py +++ b/bdisk/utils.py @@ -37,9 +37,7 @@ class XPathFmt(string.Formatter): def get_field(self, field_name, args, kwargs): vals = self.get_value(field_name, args, kwargs), field_name if not vals[0]: - print(vals) vals = ('{{{0}}}'.format(vals[1]), vals[1]) - print(vals) return(vals) class detect(object): @@ -426,9 +424,11 @@ class xml_supplicant(object): def __init__(self, cfg, profile = None, max_recurse = 5): raw = self._detect_cfg(cfg) xmlroot = lxml.etree.fromstring(raw) - self.root = lxml.etree.ElementTree(xmlroot) + self.btags = {'xpath': {}, + 'regex': {}} self.max_recurse = max_recurse self.ptrn = re.compile('(?<=(?= self.max_recurse: - return(None) + return(element) if isinstance(element, lxml.etree._Element): if isinstance(element, lxml.etree._Comment): return(element) @@ -485,16 +484,23 @@ class xml_supplicant(object): _dictmap = self.xpath_to_dict(element.text) while _dictmap: for elem in _dictmap: - if _dictmap is None: - continue - # I still for the life of me cannot figure out why this - # is not caught by the above. But it isn't. - if elem not in _dictmap: - continue +# if _dictmap is None: +# continue +# # I still for the life of me cannot figure out why this +# # is not caught by the above. But it isn't. +# if elem not in _dictmap: +# continue if isinstance(_dictmap[elem], str): try: - newpath = element.xpath(_dictmap[elem]) + print('bleh') + print(_dictmap[elem]) + try: + print(self.get_path(element)) + except: + pass + newpath = element.xpath(_dictmap[elem])[0] except (AttributeError, IndexError, TypeError): + print('blugh') newpath = element try: self.substitutions[elem] = self.substitute( @@ -532,6 +538,7 @@ class xml_supplicant(object): d = {} try: _, xpath_expr = item.split('%', 1) + print(_) if not _ == 'xpath': continue if item not in self.substitutions: