Ticket #7575: 7575.diff

django/contrib/localflavor/pe/forms.py

@@ -7 +7 @@
 from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES
 from django.utils.translation import ugettext_lazy as _
 
-class PEDepartmentSelect(Select):
+class PERegionSelect(Select):
     """
-    A Select widget that uses a list of Peruvian Departments as its choices.
+    A Select widget that uses a list of Peruvian Regions as its choices.
     """
     def __init__(self, attrs=None):
-        from pe_department import DEPARTMENT_CHOICES
-        super(PEDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_CHOICES)
+        from pe_region import REGION_CHOICES
+        super(PERegionSelect, self).__init__(attrs, choices=REGION_CHOICES)
+
+# TODO: Backwards-compatibility for legacy code.
+# PEDepartmentSelect ...
 
 class PEDNIField(CharField):
     """

deleted file django/contrib/localflavor/pe/pe_department.py

@@ -1 @@
-# -*- coding: utf-8 -*-
-"""
-A list of Peru departaments as `choices` in a
-formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-
-DEPARTMENT_CHOICES = (
-    ('AMA', u'Amazonas'),
-    ('ANC', u'Ancash'),
-    ('APU', u'Apurímac'),
-    ('ARE', u'Arequipa'),
-    ('AYA', u'Ayacucho'),
-    ('CAJ', u'Cajamarca'),
-    ('CUS', u'Cusco'),
-    ('HUV', u'Huancavelica'),
-    ('HUC', u'Huánuco'),
-    ('ICA', u'Ica'),
-    ('JUN', u'Junín'),
-    ('LAL', u'La Libertad'),
-    ('LAM', u'Lambayeque'),
-    ('LIM', u'Lima'),
-    ('LOR', u'Loreto'),
-    ('MDD', u'Madre de Dios'),
-    ('MOQ', u'Moquegua'),
-    ('PAS', u'Pasco'),
-    ('PIU', u'Piura'),
-    ('PUN', u'Puno'),
-    ('SAM', u'San Martín'),
-    ('TAC', u'Tacna'),
-    ('TUM', u'Tumbes'),
-    ('UCA', u'Ucayali'),
-)

new file django/contrib/localflavor/pe/pe_region.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+"""
+A list of Peru regions as `choices` in a formfield.
+
+This exists in this standalone file so that it's only imported into memory
+when explicitly needed.
+"""
+
+REGION_CHOICES = (
+    ('AMA', u'Amazonas'),
+    ('ANC', u'Ancash'),
+    ('APU', u'Apurímac'),
+    ('ARE', u'Arequipa'),
+    ('AYA', u'Ayacucho'),
+    ('CAJ', u'Cajamarca'),
+    ('CAL', u'Callao'),
+    ('CUS', u'Cusco'),
+    ('HUV', u'Huancavelica'),
+    ('HUC', u'Huánuco'),
+    ('ICA', u'Ica'),
+    ('JUN', u'Junín'),
+    ('LAL', u'La Libertad'),
+    ('LAM', u'Lambayeque'),
+    ('LIM', u'Lima'),
+    ('LOR', u'Loreto'),
+    ('MDD', u'Madre de Dios'),
+    ('MOQ', u'Moquegua'),
+    ('PAS', u'Pasco'),
+    ('PIU', u'Piura'),
+    ('PUN', u'Puno'),
+    ('SAM', u'San Martín'),
+    ('TAC', u'Tacna'),
+    ('TUM', u'Tumbes'),
+    ('UCA', u'Ucayali'),
+)