From 8838d4dd498c8f66ea4237fe8a79a5f77d6f95c9 Mon Sep 17 00:00:00 2001 From: Vytis Banaitis Date: Wed, 1 Feb 2017 18:41:56 +0200 Subject: Refs #23919 -- Replaced kwargs.pop() with keyword-only arguments. --- django/forms/models.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'django/forms/models.py') diff --git a/django/forms/models.py b/django/forms/models.py index a95f281b45..0368839415 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -553,9 +553,9 @@ class BaseModelFormSet(BaseFormSet): unique_fields = set() def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, - queryset=None, **kwargs): + queryset=None, *, initial=None, **kwargs): self.queryset = queryset - self.initial_extra = kwargs.pop('initial', None) + self.initial_extra = initial defaults = {'data': data, 'files': files, 'auto_id': auto_id, 'prefix': prefix} defaults.update(kwargs) super().__init__(**defaults) @@ -1065,10 +1065,10 @@ class InlineForeignKeyField(Field): 'invalid_choice': _('The inline foreign key did not match the parent instance primary key.'), } - def __init__(self, parent_instance, *args, **kwargs): + def __init__(self, parent_instance, *args, pk_field=False, to_field=None, **kwargs): self.parent_instance = parent_instance - self.pk_field = kwargs.pop("pk_field", False) - self.to_field = kwargs.pop("to_field", None) + self.pk_field = pk_field + self.to_field = to_field if self.parent_instance is not None: if self.to_field: kwargs["initial"] = getattr(self.parent_instance, self.to_field) -- cgit v1.3