bpo-35733: Make isinstance(ast.Constant(boolean), ast.Num) be false. (GH-11547)
diff --git a/Lib/ast.py b/Lib/ast.py
index 4c8c779..03b8a1b 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -346,7 +346,10 @@
except AttributeError:
return False
else:
- return isinstance(value, _const_types[cls])
+ return (
+ isinstance(value, _const_types[cls]) and
+ not isinstance(value, _const_types_not.get(cls, ()))
+ )
return type.__instancecheck__(cls, inst)
def _new(cls, *args, **kwargs):
@@ -384,3 +387,6 @@
NameConstant: (type(None), bool),
Ellipsis: (type(...),),
}
+_const_types_not = {
+ Num: (bool,),
+}
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 897e705..4bf77ff 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -411,12 +411,16 @@
self.assertFalse(isinstance(ast.Str('42'), ast.Bytes))
self.assertFalse(isinstance(ast.Num(42), ast.NameConstant))
self.assertFalse(isinstance(ast.Num(42), ast.Ellipsis))
+ self.assertFalse(isinstance(ast.NameConstant(True), ast.Num))
+ self.assertFalse(isinstance(ast.NameConstant(False), ast.Num))
self.assertFalse(isinstance(ast.Constant('42'), ast.Num))
self.assertFalse(isinstance(ast.Constant(42), ast.Str))
self.assertFalse(isinstance(ast.Constant('42'), ast.Bytes))
self.assertFalse(isinstance(ast.Constant(42), ast.NameConstant))
self.assertFalse(isinstance(ast.Constant(42), ast.Ellipsis))
+ self.assertFalse(isinstance(ast.Constant(True), ast.Num))
+ self.assertFalse(isinstance(ast.Constant(False), ast.Num))
self.assertFalse(isinstance(ast.Constant(), ast.Num))
self.assertFalse(isinstance(ast.Constant(), ast.Str))