From 6e4c6281dbb7ee12bcdc22620894edb4e9cf623f Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 7 Sep 2017 08:16:21 -0400 Subject: Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()." This reverts commit 550cb3a365dee4edfdd1563224d5304de2a57fda because try/except performs better. --- django/forms/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'django/forms/models.py') diff --git a/django/forms/models.py b/django/forms/models.py index ffa8982506..4435bf9722 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -4,7 +4,6 @@ and database field objects. """ from collections import OrderedDict -from contextlib import suppress from itertools import chain from django.core.exceptions import ( @@ -615,8 +614,10 @@ class BaseModelFormSet(BaseFormSet): kwargs['instance'] = self.get_queryset()[i] elif self.initial_extra: # Set initial values for extra forms - with suppress(IndexError): + try: kwargs['initial'] = self.initial_extra[i - self.initial_form_count()] + except IndexError: + pass form = super()._construct_form(i, **kwargs) if pk_required: form.fields[self.model._meta.pk.name].required = True -- cgit v1.3