From 8d6b82c439a8995b395375f48be881fe0a616f13 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Thu, 24 Jul 2025 12:26:31 -0500 Subject: Replace prints with logging. --- gn_libs/privileges.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gn_libs/privileges.py b/gn_libs/privileges.py index ea523a0..cd77f10 100644 --- a/gn_libs/privileges.py +++ b/gn_libs/privileges.py @@ -1,6 +1,9 @@ """Utilities for handling privileges.""" +import logging from typing import Union, Sequence, Iterator, TypeAlias +logger = logging.getLogger(__name__) + Operator: TypeAlias = str # Valid operators: "AND", "OR" Privilege: TypeAlias = str PrivilegesList: TypeAlias = Sequence[Privilege] @@ -36,11 +39,11 @@ def __build_tree__(tree_state: dict) -> ParseTree: for idx, tree in enumerate(tree_state["trees"]): _built.append(__add_leaves__(idx, (tree[2],), tree_state["leaves"])) - print(f"Number of built trees: {len(_built)}, {_built}") + logger.debug("Number of built trees: %s, %s", len(_built), _built) _num_trees = len(_built) for idx in range(0, _num_trees): _last_tree = _built.pop() - print(f"LAST TREE: {_last_tree}, {len(_last_tree)}") + logger.debug("LAST TREE: %s, %s", _last_tree, len(_last_tree)) if len(_last_tree) <= 1:# Has no leaves or subtrees _last_tree = None# type: ignore[assignment] continue# more evil @@ -48,9 +51,9 @@ def __build_tree__(tree_state: dict) -> ParseTree: _parent = tree_state["trees"][ tree_state["trees"][_num_trees - 1 - idx][1]] _op = tree_state["trees"][_num_trees - 1 - idx][2] - print(f"TREE => name: {_name}, operation: {_op}, parent: {_parent}") + logger.debug("TREE => name: %s, operation: %s, parent: %s", + _name, _op, _parent) if _name != _parent[0]:# not root tree - print(f"{_op} == {_parent[2]} : {_op == _parent[2]}") if _op == _parent[2]: _built[_parent[0]] = ( _built[_parent[0]][0],# Operator @@ -78,7 +81,6 @@ def __parse_tree__(tokens: Iterator[str]) -> ParseTree: if _idx==0: if _token[1:].upper() not in _OPERATORS_: - print(f"'{_token[1:].upper()}' == {_OPERATORS_}") raise SpecificationValueError(f"Invalid operator: {_token[1:]}") _state["open-parens"] += 1 _state["trees"].append((0, 0, _token[1:].upper(), _idx)) @@ -86,7 +88,7 @@ def __parse_tree__(tokens: Iterator[str]) -> ParseTree: continue# this is bad! if _token == ")":# end a tree - print(f"ENDING A TREE: {_state}") + logger.debug("ENDING A TREE: %s", _state) _state["open-parens"] -= 1 _state["trees"][_state["current-tree"]] = ( _state["trees"][_state["current-tree"]] + (_idx,)) @@ -103,7 +105,7 @@ def __parse_tree__(tokens: Iterator[str]) -> ParseTree: _state["current-tree"] = len(_state["trees"]) - 1 continue# more evil still - print(f"state: {_state}") + logger.debug("state: %s", _state) # leaves _state["leaves"][_state["current-tree"]] = _state["leaves"].get( _state["current-tree"], tuple()) + (_token,) -- cgit v1.2.3