Ticket #17275: 17275.diff

django/contrib/localflavor/ca/forms.py

@@ -6 +6 @@
 
 import re
 
-from django.contrib.localflavor.ca.ca_provinces import PROVINCE_CHOICES, PROVINCES_NORMALIZED
 from django.core.validators import EMPTY_VALUES
 from django.forms import ValidationError
 from django.forms.fields import Field, CharField, Select
@@ -79 +78 @@
         except AttributeError:
             pass
         else:
+            # Load data in memory only when it is required, see also #17275
+            from django.contrib.localflavor.ca.ca_provinces import PROVINCES_NORMALIZED
             try:
                 return PROVINCES_NORMALIZED[value.strip().lower()].decode('ascii')
             except KeyError:
@@ -91 +92 @@
     territories as its choices.
     """
     def __init__(self, attrs=None):
+        # Load data in memory only when it is required, see also #17275
+        from django.contrib.localflavor.ca.ca_provinces import PROVINCE_CHOICES
         super(CAProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
 
 class CASocialInsuranceNumberField(Field):

django/contrib/localflavor/id/forms.py

@@ -8 +8 @@
 import time
 
 from django.core.validators import EMPTY_VALUES
-from django.contrib.localflavor.id.id_choices import PROVINCE_CHOICES, LICENSE_PLATE_PREFIX_CHOICES
 from django.forms import ValidationError
 from django.forms.fields import Field, Select
 from django.utils.translation import ugettext_lazy as _
@@ -58 +57 @@
     """
 
     def __init__(self, attrs=None):
+        # Load data in memory only when it is required, see also #17275
+        from django.contrib.localflavor.id.id_choices import PROVINCE_CHOICES
         super(IDProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
 
 
@@ -93 +94 @@
     """
 
     def __init__(self, attrs=None):
+        # Load data in memory only when it is required, see also #17275
+        from django.contrib.localflavor.id.id_choices import LICENSE_PLATE_PREFIX_CHOICES
         super(IDLicensePlatePrefixSelect, self).__init__(attrs,
             choices=LICENSE_PLATE_PREFIX_CHOICES)
 
@@ -110 +113 @@
     }
 
     def clean(self, value):
+        # Load data in memory only when it is required, see also #17275
+        from django.contrib.localflavor.id.id_choices import LICENSE_PLATE_PREFIX_CHOICES
         super(IDLicensePlateField, self).clean(value)
         if value in EMPTY_VALUES:
             return u''