Updated list of US states and tests after r15029 to be sorted correctly.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
paltman · Dec 26, 2010 · bec3981 · bec3981
1 parent 59c40bd
commit bec3981
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/django/contrib/localflavor/us/us_states.py b/django/contrib/localflavor/us/us_states.py
@@ -152,10 +152,10 @@
 
 
 # All US states and territories plus DC and military mail.
-STATE_CHOICES = US_STATES + US_TERRITORIES + ARMED_FORCES_STATES
+STATE_CHOICES = sorted(US_STATES + US_TERRITORIES + ARMED_FORCES_STATES, key=lambda obj: obj[1])
 
 # All US Postal Service locations.
-USPS_CHOICES = US_STATES + US_TERRITORIES + ARMED_FORCES_STATES + COFA_STATES
+USPS_CHOICES = sorted(US_STATES + US_TERRITORIES + ARMED_FORCES_STATES + COFA_STATES, key=lambda obj: obj[1])
 
 STATES_NORMALIZED = {
     'ak': 'AK',

diff --git a/tests/regressiontests/forms/localflavor/us.py b/tests/regressiontests/forms/localflavor/us.py
@@ -13,6 +13,9 @@ def test_USStateSelect(self):
 <option value="AS">American Samoa</option>
 <option value="AZ">Arizona</option>
 <option value="AR">Arkansas</option>
+<option value="AA">Armed Forces Americas</option>
+<option value="AE">Armed Forces Europe</option>
+<option value="AP">Armed Forces Pacific</option>
 <option value="CA">California</option>
 <option value="CO">Colorado</option>
 <option value="CT">Connecticut</option>