xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 19:10:10 +00:00
Code Issues Projects Releases Wiki Activity

Workaround ':' format specifier syntax

Browse Source 
Older python will break by assuming that
: always means a format expression is coming.

Move the field value fetch to format_field, and ascertain if some of the
expression was shunted to format specification
by mistake.
This commit is contained in:
Jarrod Johnson 2022-03-11 12:21:09 -05:00
parent dc0183fdf4
commit 32081edec8
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
confluent_server/confluent/config/configmanager.py
View File

@ -1011,8 +1011,17 @@ class _ExpressionFormat(string.Formatter):
self._numbers = None
def get_field(self, field_name, args, kwargs):
return field_name, field_name
def format_field(self, val, format_spec):
if ']' in format_spec:
field_name = val + ':' + format_spec
format_spec = ''
else:
field_name = val
parsed = ast.parse(field_name)
return self._handle_ast_node(parsed.body[0].value), field_name
val = self._handle_ast_node(parsed.body[0].value)
return format(val, format_spec)
def _handle_ast_node(self, node):
if isinstance(node, ast.Num):
@ -1061,8 +1070,6 @@ class _ExpressionFormat(string.Formatter):
op = self._supported_ops[optype]
return op(int(self._handle_ast_node(node.left)),
int(self._handle_ast_node(node.right)))
elif isinstance(node, ast.Constant):
return node.value
elif isinstance(node, ast.Index):
return self._handle_ast_node(node.value)
elif isinstance(node, ast.UnaryOp):
@ -1087,6 +1094,8 @@ class _ExpressionFormat(string.Formatter):
else:
index = self._handle_ast_node(node.slice)
return strval[index]
elif isinstance(node, ast.Constant):
return node.value
else:
raise ValueError("Unrecognized expression syntax")