diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-07-11 23:10:08 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-07-11 23:10:08 (GMT) |
commit | 902be136be37f3d9fe8a301697821c9cc4e57709 (patch) | |
tree | 293097eb3fca6a3ccc3dd5725f7fe82a1e4e091b | |
parent | 16d037653d50a035f106636715095840e4fabe70 (diff) | |
download | cpython-902be136be37f3d9fe8a301697821c9cc4e57709.zip cpython-902be136be37f3d9fe8a301697821c9cc4e57709.tar.gz cpython-902be136be37f3d9fe8a301697821c9cc4e57709.tar.bz2 |
Merged revisions 82828 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82828 | benjamin.peterson | 2010-07-11 18:06:06 -0500 (Sun, 11 Jul 2010) | 1 line
allow byte literals
........
-rw-r--r-- | Lib/ast.py | 2 | ||||
-rw-r--r-- | Lib/test/test_ast.py | 1 | ||||
-rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -50,7 +50,7 @@ def literal_eval(node_or_string): if isinstance(node_or_string, Expression): node_or_string = node_or_string.body def _convert(node): - if isinstance(node, Str): + if isinstance(node, (Str, Bytes)): return node.s elif isinstance(node, Num): return node.n diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py index 7ee16bf..e188887 100644 --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -271,6 +271,7 @@ class ASTHelpers_Test(unittest.TestCase): self.assertEqual(ast.literal_eval('[1, 2, 3]'), [1, 2, 3]) self.assertEqual(ast.literal_eval('{"foo": 42}'), {"foo": 42}) self.assertEqual(ast.literal_eval('(True, False, None)'), (True, False, None)) + self.assertEqual(ast.literal_eval('b"hi"'), b"hi") self.assertRaises(ValueError, ast.literal_eval, 'foo()') def test_literal_eval_issue4907(self): @@ -78,6 +78,8 @@ C-API Library ------- +- ``ast.literal_eval()`` now allows byte literals. + - Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated keyword arguments called 'self' or 'other' specially. |