# serialization
#
-cnf_line_nest_indent = b" "
-cnf_line_base_fmt = b"%d %s,%d: \"%s\""
-cnf_line_child_fmt = b"%d %s(%d) %s,%d: \"%s\""
-
+cnf_line_nest_indent = " "
+cnf_line_base_fmt = "%d %s,%d: \"%s\""
+cnf_line_child_fmt = "%d %s(%d) %s,%d: \"%s\""
def format_cnf_vars(da, var):
"""
if depth > 0:
line = cnf_line_child_fmt \
% (var["number"],
- cnf_line_nest_indent * depth,
- var["parent"],
- to_latin1(var["varname"]),
- var["instance"],
- to_latin1(var["data"]))
+ cnf_line_nest_indent * depth,
+ var["parent"],
+ var["varname"],
+ var["instance"],
+ var["data"])
else:
line = cnf_line_base_fmt \
% (var["number"],
- to_latin1(var["varname"]),
- var["instance"],
- to_latin1(var["data"]))
+ var["varname"],
+ var["instance"],
+ var["data"])
comment = var.get("comment", None)
if comment and len (comment) != 0:
- line = line + (b" # %s" % to_latin1(comment))
+ line = line + (" # %s" % comment)
- acc.append(line)
+ acc.append(to_latin1 (line))
children = var.get("children", None)
if children is not None:
(_, acc) = functools.reduce(format_cnf_vars, children, (depth + 1, acc))
+
return (depth, acc)
def print_cnf(root, out=None, renumber=False):
if root is not None:
- output_cnf(root, out or sys.stdout, renumber=renumber, bytes=False)
+ output_cnf(root, out or sys.stdout, renumber=renumber)
def write_cnf(*argv, **kw_argv):