fix: Window.order_by accepts str field_names, asc/desc accepts None in 4.1+ (#1574)

* fix: Window.order_by accepts str field_names, asc/desc accepts None in 4.1+

See https://docs.djangoproject.com/en/4.2/ref/models/expressions/#django.db.models.Expression.asc

Closes #1512

* chore: delete fixes from allowlist_todo

Author: GabDug

django-stubs/db/models/expressions.pyi

@@ -96,14 +96,14 @@ class BaseExpression:
         self,
         *,
         descending: bool = ...,
-        nulls_first: bool = ...,
-        nulls_last: bool = ...,
+        nulls_first: bool | None = ...,
+        nulls_last: bool | None = ...,
     ) -> OrderBy: ...
     def desc(
         self,
         *,
-        nulls_first: bool = ...,
-        nulls_last: bool = ...,
+        nulls_first: bool | None = ...,
+        nulls_last: bool | None = ...,
     ) -> OrderBy: ...
     def reverse_ordering(self) -> BaseExpression: ...
     def flatten(self) -> Iterator[BaseExpression]: ...
@@ -139,14 +139,14 @@ class F(Combinable):
         self,
         *,
         descending: bool = ...,
-        nulls_first: bool = ...,
-        nulls_last: bool = ...,
+        nulls_first: bool | None = ...,
+        nulls_last: bool | None = ...,
     ) -> OrderBy: ...
     def desc(
         self,
         *,
-        nulls_first: bool = ...,
-        nulls_last: bool = ...,
+        nulls_first: bool | None = ...,
+        nulls_last: bool | None = ...,
     ) -> OrderBy: ...
     def deconstruct(self) -> Any: ...  # fake
 
@@ -247,9 +247,11 @@ class OrderBy(Expression):
         self,
         expression: Expression | F | Subquery,
         descending: bool = ...,
-        nulls_first: bool = ...,
-        nulls_last: bool = ...,
+        nulls_first: bool | None = ...,
+        nulls_last: bool | None = ...,
     ) -> None: ...
+    def asc(self) -> None: ...  # type: ignore[override]
+    def desc(self) -> None: ...  # type: ignore[override]
 
 class Window(SQLiteNumericMixin, Expression):
     template: str
@@ -261,7 +263,7 @@ class Window(SQLiteNumericMixin, Expression):
         self,
         expression: BaseExpression,
         partition_by: str | Iterable[BaseExpression | F] | F | BaseExpression | None = ...,
-        order_by: Sequence[BaseExpression | F] | BaseExpression | F | None = ...,
+        order_by: Sequence[BaseExpression | F | str] | BaseExpression | F | str | None = ...,
         frame: WindowFrame | None = ...,
         output_field: Field | None = ...,
     ) -> None: ...

scripts/stubtest/allowlist_todo.txt

@@ -436,13 +436,10 @@ django.contrib.gis.db.models.OneToOneField.formfield
 django.contrib.gis.db.models.OneToOneField.forward_related_accessor_class
 django.contrib.gis.db.models.OneToOneField.related_accessor_class
 django.contrib.gis.db.models.OneToOneRel.__init__
-django.contrib.gis.db.models.OrderBy.__init__
 django.contrib.gis.db.models.OrderBy.__new__
 django.contrib.gis.db.models.OrderBy.as_oracle
 django.contrib.gis.db.models.OrderBy.as_sql
-django.contrib.gis.db.models.OrderBy.asc
 django.contrib.gis.db.models.OrderBy.deconstruct
-django.contrib.gis.db.models.OrderBy.desc
 django.contrib.gis.db.models.PositiveBigIntegerField.formfield
 django.contrib.gis.db.models.PositiveBigIntegerField.integer_field_class
 django.contrib.gis.db.models.PositiveIntegerField.formfield
@@ -1472,13 +1469,10 @@ django.db.models.OneToOneField.formfield
 django.db.models.OneToOneField.forward_related_accessor_class
 django.db.models.OneToOneField.related_accessor_class
 django.db.models.OneToOneRel.__init__
-django.db.models.OrderBy.__init__
 django.db.models.OrderBy.__new__
 django.db.models.OrderBy.as_oracle
 django.db.models.OrderBy.as_sql
-django.db.models.OrderBy.asc
 django.db.models.OrderBy.deconstruct
-django.db.models.OrderBy.desc
 django.db.models.PositiveBigIntegerField.formfield
 django.db.models.PositiveBigIntegerField.integer_field_class
 django.db.models.PositiveIntegerField.formfield
@@ -1601,13 +1595,10 @@ django.db.models.expressions.Func.__new__
 django.db.models.expressions.Func.deconstruct
 django.db.models.expressions.Func.function
 django.db.models.expressions.NegatedExpression.select_format
-django.db.models.expressions.OrderBy.__init__
 django.db.models.expressions.OrderBy.__new__
 django.db.models.expressions.OrderBy.as_oracle
 django.db.models.expressions.OrderBy.as_sql
-django.db.models.expressions.OrderBy.asc
 django.db.models.expressions.OrderBy.deconstruct
-django.db.models.expressions.OrderBy.desc
 django.db.models.expressions.Ref.get_refs
 django.db.models.expressions.Ref.relabeled_clone
 django.db.models.expressions.ResolvedOuterRef.as_sql