[5.2] Fix django.template.library (#2633)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: sobolevn

django-stubs/template/library.pyi

@@ -5,7 +5,7 @@ from django.template.base import FilterExpression, Origin, Parser, Token
 from django.template.context import Context
 from django.utils.safestring import SafeString
 
-from .base import Node, Template
+from .base import Node, NodeList, Template
 
 class InvalidTemplateLibrary(Exception): ...
 
@@ -28,17 +28,36 @@ class Library:
     def filter(self, name: str | None, filter_func: _C, **flags: Any) -> _C: ...
     @overload
     def filter(self, name: str | None = None, filter_func: None = None, **flags: Any) -> Callable[[_C], _C]: ...
+    def filter_function(self, func: _C, **flags: Any) -> _C: ...
     @overload
     def simple_tag(self, func: _C, takes_context: bool | None = None, name: str | None = None) -> _C: ...
     @overload
-    def simple_tag(self, takes_context: bool | None = None, name: str | None = None) -> Callable[[_C], _C]: ...
+    def simple_tag(
+        self, func: None = None, takes_context: bool | None = None, name: str | None = None
+    ) -> Callable[[_C], _C]: ...
     def inclusion_tag(
         self,
         filename: Template | str,
         func: Callable | None = None,
         takes_context: bool | None = None,
         name: str | None = None,
     ) -> Callable[[_C], _C]: ...
+    @overload
+    def simple_block_tag(
+        self,
+        func: _C,
+        takes_context: bool | None = None,
+        name: str | None = None,
+        end_name: str | None = None,
+    ) -> _C: ...
+    @overload
+    def simple_block_tag(
+        self,
+        func: None = None,
+        takes_context: bool | None = None,
+        name: str | None = None,
+        end_name: str | None = None,
+    ) -> Callable[[_C], _C]: ...
 
 class TagHelperNode(Node):
     func: Any
@@ -71,6 +90,19 @@ class SimpleNode(TagHelperNode):
         target_var: str | None,
     ) -> None: ...
 
+class SimpleBlockNode(SimpleNode):
+    nodelist: NodeList
+
+    def __init__(
+        self,
+        nodelist: NodeList,
+        func: Callable,
+        takes_context: bool | None,
+        args: list[FilterExpression],
+        kwargs: dict[str, FilterExpression],
+        target_var: str | None,
+    ) -> None: ...
+
 class InclusionNode(TagHelperNode):
     args: list[FilterExpression]
     func: Callable

scripts/stubtest/allowlist_todo.txt

@@ -1132,8 +1132,6 @@ django.http.HttpRequest.__init__
 django.http.StreamingHttpResponse.content
 django.http.request.HttpRequest.__init__
 django.http.response.StreamingHttpResponse.content
-django.template.Library.filter_function
-django.template.Library.simple_tag
 django.template.Node.__iter__
 django.template.VariableDoesNotExist.__init__
 django.template.base.Context
@@ -1146,8 +1144,6 @@ django.template.defaulttags.do_ifequal
 django.template.defaulttags.ifequal
 django.template.defaulttags.ifnotequal
 django.template.library.InclusionNode.token
-django.template.library.Library.filter_function
-django.template.library.Library.simple_tag
 django.template.library.SimpleNode.token
 django.template.loader_tags.BlockNode.token
 django.template.loader_tags.ExtendsNode.token

scripts/stubtest/allowlist_todo_django52.txt

@@ -168,8 +168,5 @@ django.forms.models.ModelChoiceField.validate_no_null_characters
 django.forms.renderers.BaseRenderer.bound_field_class
 django.http.QueryDict.pop
 django.http.request.QueryDict.pop
-django.template.Library.simple_block_tag
 django.template.autoreload
-django.template.library.Library.simple_block_tag
-django.template.library.SimpleBlockNode
 django.test.runner.ParallelTestSuite.handle_event

tests/typecheck/template/test_library.yml

@@ -67,6 +67,29 @@
 
         reveal_type(register.simple_tag(f, name='double')) # N: Revealed type is "def (s: builtins.str) -> builtins.str"
 
+-   case: register_simple_block_tag
+    main: |
+        import datetime
+        from django import template
+        register = template.Library()
+
+        def f(s: str) -> str:
+            return s * 2
+
+        reveal_type(register.simple_block_tag(f, name='double')) # N: Revealed type is "def (s: builtins.str) -> builtins.str"
+
+        @register.simple_block_tag
+        def current_time(format_string: str) -> str:
+            return datetime.datetime.now().strftime(format_string)
+
+        reveal_type(current_time) # N: Revealed type is "def (format_string: builtins.str) -> builtins.str"
+
+        @register.simple_block_tag(name='minustwo')
+        def some_function(value: int) -> int:
+            return value - 2
+
+        reveal_type(some_function) # N: Revealed type is "def (value: builtins.int) -> builtins.int"
+
 -   case: register_tag_no_args
     main: |
         from django import template