Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion fire/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

import argparse
import ast
import io
import sys
import tokenize

if sys.version_info[0:2] < (3, 8):
_StrNode = ast.Str # type: ignore # pylint: disable=no-member # deprecated but needed for Python < 3.8
Expand Down Expand Up @@ -68,7 +70,17 @@ def DefaultParseValue(value):
Returns:
The parsed value, of the type determined most appropriate.
"""
# Note: _LiteralEval will treat '#' as the start of a comment.
# Keep unquoted hash characters intact rather than letting Python's AST
# parser silently drop a trailing comment from command-line arguments.
# Quoted hashes remain valid parts of Python literals.
if '#' in value:
try:
tokens = tokenize.generate_tokens(io.StringIO(value).readline)
if any(token.type == tokenize.COMMENT for token in tokens):
return value
except tokenize.TokenError:
# Let the existing literal parser handle incomplete expressions.
pass
try:
return _LiteralEval(value)
except (SyntaxError, ValueError):
Expand Down
11 changes: 9 additions & 2 deletions fire/parser_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,15 @@ def testDefaultParseValueNestedContainers(self):

def testDefaultParseValueComments(self):
self.assertEqual(parser.DefaultParseValue('"0#comments"'), '0#comments')
# Comments are stripped. This behavior may change in the future.
self.assertEqual(parser.DefaultParseValue('0#comments'), 0)
self.assertEqual(parser.DefaultParseValue('0#comments'), '0#comments')
self.assertEqual(parser.DefaultParseValue('qgm#123'), 'qgm#123')
self.assertEqual(parser.DefaultParseValue('#literal'), '#literal')
self.assertEqual(parser.DefaultParseValue('a#b#c'), 'a#b#c')

def testDefaultParseValueQuotedHashesInContainers(self):
self.assertEqual(parser.DefaultParseValue('["a#b", 2]'), ['a#b', 2])
self.assertEqual(parser.DefaultParseValue('{"key": "a#b"}'),
{'key': 'a#b'})

def testDefaultParseValueBadLiteral(self):
# If it can't be parsed, we treat it as a string. This behavior may change.
Expand Down
Loading