Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[py3] Avoided comparison with None value in formsets

  • Loading branch information...
commit 5e958b958b4b27082a393decf64ec573fa7454b2 1 parent 73f0f18
@claudep claudep authored
Showing with 6 additions and 5 deletions.
  1. +6 −5 django/forms/formsets.py
View
11 django/forms/formsets.py
@@ -95,10 +95,11 @@ def total_form_count(self):
total_forms = initial_forms + self.extra
# Allow all existing related objects/inlines to be displayed,
# but don't allow extra beyond max_num.
- if initial_forms > self.max_num >= 0:
- total_forms = initial_forms
- elif total_forms > self.max_num >= 0:
- total_forms = self.max_num
+ if self.max_num is not None:
+ if initial_forms > self.max_num >= 0:
+ total_forms = initial_forms
+ elif total_forms > self.max_num >= 0:
+ total_forms = self.max_num
return total_forms
def initial_form_count(self):
@@ -108,7 +109,7 @@ def initial_form_count(self):
else:
# Use the length of the inital data if it's there, 0 otherwise.
initial_forms = self.initial and len(self.initial) or 0
- if initial_forms > self.max_num >= 0:
+ if self.max_num is not None and (initial_forms > self.max_num >= 0):
initial_forms = self.max_num
return initial_forms
Please sign in to comment.
Something went wrong with that request. Please try again.