Fix _BoolLiteral not being treated as equivalent to Literal.

Author: dnwpark

tests/test_type_eval.py

@@ -31,6 +31,7 @@
     GetSpecialAttr,
     GetType,
     GetAnnotations,
+    IsSubtype,
     IsSub,
     Iter,
     Length,
@@ -1337,7 +1338,7 @@ def test_eval_bool_05():
     assert d == Literal[False]
 
 
-def test_eval_literal_generic_01():
+def test_eval_bool_literal_01():
     d = eval_typing(_BoolLiteral[True])
     assert d == _BoolLiteral[True]
     d = eval_typing(_BoolLiteral[False])
@@ -1352,7 +1353,7 @@ def test_eval_literal_generic_01():
     assert d == _BoolLiteral[False]
 
 
-def test_eval_literal_generic_02():
+def test_eval_bool_literal_02():
     d = eval_typing(not _BoolLiteral[True])
     assert d == _BoolLiteral[False]
 
@@ -1362,7 +1363,7 @@ def test_eval_literal_generic_02():
     assert d == _BoolLiteral[True]
 
 
-def test_eval_literal_generic_03():
+def test_eval_bool_literal_03():
     d = eval_typing(AndLiteralGeneric[_BoolLiteral[True], _BoolLiteral[True]])
     assert d == _BoolLiteral[True]
     d = eval_typing(AndLiteralGeneric[_BoolLiteral[True], _BoolLiteral[False]])
@@ -1373,7 +1374,7 @@ def test_eval_literal_generic_03():
     assert d == _BoolLiteral[False]
 
 
-def test_eval_literal_generic_04():
+def test_eval_bool_literal_04():
     d = eval_typing(OrLiteralGeneric[_BoolLiteral[True], _BoolLiteral[True]])
     assert d == _BoolLiteral[True]
     d = eval_typing(OrLiteralGeneric[_BoolLiteral[True], _BoolLiteral[False]])
@@ -1384,21 +1385,48 @@ def test_eval_literal_generic_04():
     assert d == _BoolLiteral[False]
 
 
-def test_eval_literal_generic_05():
+def test_eval_bool_literal_05():
     d = eval_typing(LiteralGenericToLiteral[_BoolLiteral[True]])
     assert d == Literal[True]
     d = eval_typing(LiteralGenericToLiteral[_BoolLiteral[False]])
     assert d == Literal[False]
 
 
-def test_eval_literal_generic_06():
+def test_eval_bool_literal_06():
     d = eval_typing(NotLiteralGenericToLiteral[_BoolLiteral[True]])
     assert d == Literal[False]
     d = eval_typing(NotLiteralGenericToLiteral[_BoolLiteral[False]])
     assert d == Literal[True]
 
 
-def test_eval_literal_generic_error_01():
+def test_eval_bool_literal_07():
+    d = eval_typing(IsSub[_BoolLiteral[True], Literal[True]])
+    assert d == _BoolLiteral[True]
+    d = eval_typing(IsSub[_BoolLiteral[False], Literal[False]])
+    assert d == _BoolLiteral[True]
+
+    d = eval_typing(IsSub[Literal[True], _BoolLiteral[True]])
+    assert d == _BoolLiteral[True]
+    d = eval_typing(IsSub[Literal[False], _BoolLiteral[False]])
+    assert d == _BoolLiteral[True]
+
+    d = eval_typing(IsSubtype[_BoolLiteral[True], Literal[True]])
+    assert d == _BoolLiteral[True]
+    d = eval_typing(IsSubtype[_BoolLiteral[False], Literal[False]])
+    assert d == _BoolLiteral[True]
+
+    d = eval_typing(IsSubtype[Literal[True], _BoolLiteral[True]])
+    assert d == _BoolLiteral[True]
+    d = eval_typing(IsSubtype[Literal[False], _BoolLiteral[False]])
+    assert d == _BoolLiteral[True]
+
+    d = eval_typing(Matches[_BoolLiteral[True], Literal[True]])
+    assert d == _BoolLiteral[True]
+    d = eval_typing(Matches[_BoolLiteral[False], Literal[False]])
+    assert d == _BoolLiteral[True]
+
+
+def test_eval_bool_literal_error_01():
     with pytest.raises(TypeError, match="Expected literal type, got 'int'"):
         eval_typing(_BoolLiteral[int])
 

typemap/type_eval/_typing_inspect.py

@@ -132,7 +132,9 @@ def is_optional_type(t: Any) -> TypeGuard[UnionType]:
 
 
 def is_literal(t: Any) -> bool:
-    return is_generic_alias(t) and get_origin(t) is Literal  # type: ignore [comparison-overlap]
+    from typemap.typing import _BoolLiteral
+
+    return is_generic_alias(t) and get_origin(t) in (Literal, _BoolLiteral)
 
 
 def get_head(t: Any) -> type | None: