Commits

Mark Lavin  committed 28b48cc

Enforce default SELECTABLE_MAX_LIMIT to reduce future hasattr/getattr calls.

  • Participants
  • Parent commits 257675b
  • Branches result-refactor

Comments (0)

Files changed (2)

File selectable/forms/base.py

 
 __all__ = ('BaseLookupForm', )
 
-DEFAULT_LIMIT = getattr(settings, 'SELECTABLE_MAX_LIMIT', 25)
-
 
 class BaseLookupForm(forms.Form):
     term = forms.CharField(required=False)
     def clean_limit(self):
         "Ensure given limit is less than default if defined"
         limit = self.cleaned_data.get('limit', None)
-        if DEFAULT_LIMIT and (not limit or limit > DEFAULT_LIMIT):
-            limit = DEFAULT_LIMIT
+        if (settings.SELECTABLE_MAX_LIMIT is not None and 
+            (not limit or limit > settings.SELECTABLE_MAX_LIMIT)):
+            limit = settings.SELECTABLE_MAX_LIMIT
         return limit

File selectable/models.py

-from django.db import models
+from django.conf import settings
 
-# Create your models here.
+# Set default settings
+if not hasattr(settings, 'SELECTABLE_MAX_LIMIT'):
+    settings.SELECTABLE_MAX_LIMIT = 25