diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2019-05-25 16:49:35 +0200 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2019-05-25 16:50:07 +0200 |
| commit | e1da7aa4d041d25e4fd5fd1f603f4c28d32b1392 (patch) | |
| tree | 3f4678ea2988b2c15a423ec8835177ac8fb4de35 | |
| parent | bb33eed5cc6bdce2b65aa570ecd9a400bcd9c180 (diff) | |
Display n/m/y without quotes
These are constant symbols, which is why the quotes showed up.
Special-case them to remove the quotes, to match what people expect.
Internally, n/m/y without quotes is taken as a shorthand for
"n"/"m"/"y".
| -rw-r--r-- | kconfiglib.py | 4 | ||||
| -rw-r--r-- | testsuite.py | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/kconfiglib.py b/kconfiglib.py index 8112e11..55d08f6 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -5652,7 +5652,9 @@ def standard_sc_expr_str(sc): See expr_str(). """ if sc.__class__ is Symbol: - return '"{}"'.format(escape(sc.name)) if sc.is_constant else sc.name + if sc.is_constant and sc.name not in ("n", "m", "y"): + return '"{}"'.format(escape(sc.name)) + return sc.name # Choice return "<choice {}>".format(sc.name) if sc.name else "<choice>" diff --git a/testsuite.py b/testsuite.py index f3f2b42..8a66567 100644 --- a/testsuite.py +++ b/testsuite.py @@ -807,16 +807,16 @@ comment "advanced comment" config DEP_REM_CORNER_CASES bool default A - depends on "n" + depends on n config DEP_REM_CORNER_CASES bool - default B if "n" + default B if n config DEP_REM_CORNER_CASES bool default C - depends on "m" && MODULES + depends on m && MODULES config DEP_REM_CORNER_CASES bool @@ -1257,10 +1257,10 @@ tests/Krecursive2:1 c = Kconfig("Kconfiglib/tests/Kdirdep") - verify_equal(expr_str(c.syms["NO_DEP_SYM"].direct_dep), '"y"') + verify_equal(expr_str(c.syms["NO_DEP_SYM"].direct_dep), 'y') verify_equal(expr_str(c.syms["DEP_SYM"].direct_dep), "A || (B && C) || !D") - verify_equal(expr_str(c.named_choices["NO_DEP_CHOICE"].direct_dep), '"y"') + verify_equal(expr_str(c.named_choices["NO_DEP_CHOICE"].direct_dep), 'y') verify_equal(expr_str(c.named_choices["DEP_CHOICE"].direct_dep), "A || B || C") |