Handle set() as literal as in ast.literal_eval

sebastinas · sebastinas · commit 9b7009f25459 · 2020-10-11T16:44:24.000+02:00
diff --git a/bpython/simpleeval.py b/bpython/simpleeval.py
@@ -95,7 +95,7 @@ def simple_eval(node_or_string, namespace=None):
     def _convert(node):
         if py3 and isinstance(node, ast.Constant):
             return node.value
-        if isinstance(node, _string_type_nodes):
+        elif isinstance(node, _string_type_nodes):
             return node.s
         elif isinstance(node, ast.Num):
             return node.n
@@ -110,6 +110,13 @@ def _convert(node):
             )
         elif isinstance(node, ast.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()
 
         # this is a deviation from literal_eval: we allow non-literals
         elif isinstance(node, _name_type_nodes):
@@ -256,4 +263,3 @@ def evaluate_current_attribute(cursor_offset, line, namespace=None):
         raise EvaluationError(
             "can't lookup attribute %s on %r" % (attr.word, obj)
         )
-
diff --git a/bpython/test/test_simpleeval.py b/bpython/test/test_simpleeval.py
@@ -25,6 +25,7 @@ def test_matches_stdlib(self):
     def test_matches_stdlib_py3(self):
         """Should match the stdlib literal_eval if no names or indexing"""
         self.assertMatchesStdlib("{1, 2}")
+        self.assertMatchesStdlib("set()")
 
     def test_indexing(self):
         """Literals can be indexed into"""
