From: Raymond Hettinger <rhettinger@users.noreply.github.com>
Date: Fri, 3 Jan 2020 05:21:18 +0000 (-0700)
Subject: bpo-39158: ast.literal_eval() doesn't support empty sets (GH-17742)
X-Git-Tag: v3.9.0a3~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fcf5c12a37a8d3d8d6303c44c223dbc8d568cfd;p=thirdparty%2FPython%2Fcpython.git

bpo-39158: ast.literal_eval() doesn't support empty sets (GH-17742)
---

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index 190d9286effb..c380a81bee6d 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -194,6 +194,9 @@ and classes for traversing abstract syntax trees:
    .. versionchanged:: 3.2
       Now allows bytes and set literals.
 
+   .. versionchanged:: 3.9
+      Now supports creating empty sets with ``'set()'``.
+
 
 .. function:: get_docstring(node, clean=True)
 
diff --git a/Lib/ast.py b/Lib/ast.py
index ece8b139e460..495c0d618f12 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -83,6 +83,9 @@ def literal_eval(node_or_string):
             return list(map(_convert, node.elts))
         elif isinstance(node, Set):
             return set(map(_convert, node.elts))
+        elif (isinstance(node, Call) and isinstance(node.func, Name) and
+              node.func.id == 'set' and node.args == node.keywords == []):
+            return set()
         elif isinstance(node, Dict):
             return dict(zip(map(_convert, node.keys),
                             map(_convert, node.values)))
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 51a7c1af1ffe..55b91cfa23be 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -891,6 +891,7 @@ Module(
         self.assertEqual(ast.literal_eval('(True, False, None)'), (True, False, None))
         self.assertEqual(ast.literal_eval('{1, 2, 3}'), {1, 2, 3})
         self.assertEqual(ast.literal_eval('b"hi"'), b"hi")
+        self.assertEqual(ast.literal_eval('set()'), set())
         self.assertRaises(ValueError, ast.literal_eval, 'foo()')
         self.assertEqual(ast.literal_eval('6'), 6)
         self.assertEqual(ast.literal_eval('+6'), 6)
diff --git a/Misc/NEWS.d/next/Library/2019-12-29-15-44-38.bpo-39158.cxVoOR.rst b/Misc/NEWS.d/next/Library/2019-12-29-15-44-38.bpo-39158.cxVoOR.rst
new file mode 100644
index 000000000000..c41799bebaeb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-12-29-15-44-38.bpo-39158.cxVoOR.rst
@@ -0,0 +1 @@
+ast.literal_eval() now supports empty sets.