mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
Refs #33543 -- Made Expression.asc()/desc() and OrderBy raise ValueError when nulls_first/nulls_last=False is passed.
Per deprecation timeline.
This commit is contained in:
@@ -2,7 +2,6 @@ import copy
|
||||
import datetime
|
||||
import functools
|
||||
import inspect
|
||||
import warnings
|
||||
from collections import defaultdict
|
||||
from decimal import Decimal
|
||||
from uuid import UUID
|
||||
@@ -13,7 +12,6 @@ from django.db.models import fields
|
||||
from django.db.models.constants import LOOKUP_SEP
|
||||
from django.db.models.query_utils import Q
|
||||
from django.utils.deconstruct import deconstructible
|
||||
from django.utils.deprecation import RemovedInDjango50Warning
|
||||
from django.utils.functional import cached_property
|
||||
from django.utils.hashable import make_hashable
|
||||
|
||||
@@ -1571,16 +1569,7 @@ class OrderBy(Expression):
|
||||
if nulls_first and nulls_last:
|
||||
raise ValueError("nulls_first and nulls_last are mutually exclusive")
|
||||
if nulls_first is False or nulls_last is False:
|
||||
# When the deprecation ends, replace with:
|
||||
# raise ValueError(
|
||||
# "nulls_first and nulls_last values must be True or None."
|
||||
# )
|
||||
warnings.warn(
|
||||
"Passing nulls_first=False or nulls_last=False is deprecated, use None "
|
||||
"instead.",
|
||||
RemovedInDjango50Warning,
|
||||
stacklevel=2,
|
||||
)
|
||||
raise ValueError("nulls_first and nulls_last values must be True or None.")
|
||||
self.nulls_first = nulls_first
|
||||
self.nulls_last = nulls_last
|
||||
self.descending = descending
|
||||
|
||||
Reference in New Issue
Block a user