mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-23 03:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refs #23919 -- Replaced kwargs.pop() with keyword-only arguments.

Browse source
This commit is contained in:
Vytis Banaitis 2017-02-01 18:41:56 +02:00 • committed by Tim Graham
parent 0ec4dc91e0
commit 8838d4dd49
41 changed files with 147 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

11
django/db/models/expressions.py
View file

@ -506,7 +506,7 @@ class Func(Expression):
arg_joiner = ', '
arity = None # The number of arguments the function accepts.
def __init__(self, *expressions, **extra):
def __init__(self, *expressions, output_field=None, **extra):
if self.arity is not None and len(expressions) != self.arity:
raise TypeError(
"'%s' takes exactly %s %s (%s given)" % (
@ -516,7 +516,6 @@ class Func(Expression):
len(expressions),
)
)
output_field = extra.pop('output_field', None)
super().__init__(output_field=output_field)
self.source_expressions = self._parse_expressions(*expressions)
self.extra = extra
@ -828,11 +827,9 @@ class Case(Expression):
template = 'CASE %(cases)s ELSE %(default)s END'
case_joiner = ' '
def __init__(self, *cases, **extra):
def __init__(self, *cases, default=None, output_field=None, **extra):
if not all(isinstance(case, When) for case in cases):
raise TypeError("Positional arguments must all be When objects.")
default = extra.pop('default', None)
output_field = extra.pop('output_field', None)
super().__init__(output_field)
self.cases = list(cases)
self.default = self._parse_expressions(default)[0]
@ -983,8 +980,8 @@ class Subquery(Expression):
class Exists(Subquery):
template = 'EXISTS(%(subquery)s)'
def __init__(self, *args, **kwargs):
self.negated = kwargs.pop('negated', False)
def __init__(self, *args, negated=False, **kwargs):
self.negated = negated
super().__init__(*args, **kwargs)
def __invert__(self):