Skip to content

Preserve template arguments that contain unhashable literals #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codewithfourtix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve template arguments that contain unhashable literals #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion fire/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def DefaultParseValue(value):
# Note: _LiteralEval will treat '#' as the start of a comment.
try:
return _LiteralEval(value)
except (SyntaxError, ValueError):
except (SyntaxError, ValueError, TypeError):
# If _LiteralEval can't parse the value, treat it as a string.
return value

Expand Down
9 changes: 9 additions & 0 deletions fire/parser_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,15 @@ def testDefaultParseValueBadLiteral(self):
parser.DefaultParseValue('[(A, 2, "3"), 5'), '[(A, 2, "3"), 5')
self.assertEqual(parser.DefaultParseValue('x=10'), 'x=10')

def testDefaultParseValueUnhashableLiteral(self):
for value in ('{{name}}', '{[1]}', '{[1]: 2}', '{{a: 1}: 2}'):
with self.subTest(value=value):
self.assertEqual(parser.DefaultParseValue(value), value)

def testDefaultParseValueHashableContainers(self):
self.assertEqual(parser.DefaultParseValue('{one, two}'), {'one', 'two'})
self.assertEqual(parser.DefaultParseValue('{(1, 2): [3]}'), {(1, 2): [3]})

def testDefaultParseValueSyntaxError(self):
# If it can't be parsed, we treat it as a string.
self.assertEqual(parser.DefaultParseValue('"'), '"')
Expand Down
Loading