From 1245b5c01ed4e9716ceda1e14e1167a70093a3b5 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun, 8 Apr 2007 11:21:00 +0000
Subject: [PATCH] Backwards-incompatible change -- Renamed localflavor.usa to
 localflavor.us to match naming of other flavors.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/localflavor/{usa => us}/__init__.py  |  0
 django/contrib/localflavor/{usa => us}/forms.py     |  0
 django/contrib/localflavor/{usa => us}/us_states.py |  0
 django/db/models/fields/__init__.py                 |  2 +-
 tests/regressiontests/forms/localflavor.py          | 10 +++++-----
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename django/contrib/localflavor/{usa => us}/__init__.py (100%)
 rename django/contrib/localflavor/{usa => us}/forms.py (100%)
 rename django/contrib/localflavor/{usa => us}/us_states.py (100%)

diff --git a/django/contrib/localflavor/usa/__init__.py b/django/contrib/localflavor/us/__init__.py
similarity index 100%
rename from django/contrib/localflavor/usa/__init__.py
rename to django/contrib/localflavor/us/__init__.py
diff --git a/django/contrib/localflavor/usa/forms.py b/django/contrib/localflavor/us/forms.py
similarity index 100%
rename from django/contrib/localflavor/usa/forms.py
rename to django/contrib/localflavor/us/forms.py
diff --git a/django/contrib/localflavor/usa/us_states.py b/django/contrib/localflavor/us/us_states.py
similarity index 100%
rename from django/contrib/localflavor/usa/us_states.py
rename to django/contrib/localflavor/us/us_states.py
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 3972de7d4a..466897ad86 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -761,7 +761,7 @@ class PhoneNumberField(IntegerField):
         validators.isValidPhone(field_data, all_data)
 
     def formfield(self, **kwargs):
-        from django.contrib.localflavor.usa.forms import USPhoneNumberField
+        from django.contrib.localflavor.us.forms import USPhoneNumberField
         defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
         defaults.update(kwargs)
         return USPhoneNumberField(**defaults)
diff --git a/tests/regressiontests/forms/localflavor.py b/tests/regressiontests/forms/localflavor.py
index fecb57d81b..5c6f610b16 100644
--- a/tests/regressiontests/forms/localflavor.py
+++ b/tests/regressiontests/forms/localflavor.py
@@ -6,7 +6,7 @@ localflavor_tests = r"""
 
 USZipCodeField validates that the data is either a five-digit U.S. zip code or
 a zip+4.
->>> from django.contrib.localflavor.usa.forms import USZipCodeField
+>>> from django.contrib.localflavor.us.forms import USZipCodeField
 >>> f = USZipCodeField()
 >>> f.clean('60606')
 u'60606'
@@ -67,7 +67,7 @@ u''
 
 USPhoneNumberField validates that the data is a valid U.S. phone number,
 including the area code. It's normalized to XXX-XXX-XXXX format.
->>> from django.contrib.localflavor.usa.forms import USPhoneNumberField
+>>> from django.contrib.localflavor.us.forms import USPhoneNumberField
 >>> f = USPhoneNumberField()
 >>> f.clean('312-555-1212')
 u'312-555-1212'
@@ -136,7 +136,7 @@ u''
 
 USStateField validates that the data is either an abbreviation or name of a
 U.S. state.
->>> from django.contrib.localflavor.usa.forms import USStateField
+>>> from django.contrib.localflavor.us.forms import USStateField
 >>> f = USStateField()
 >>> f.clean('il')
 u'IL'
@@ -181,7 +181,7 @@ u''
 
 USStateSelect is a Select widget that uses a list of U.S. states/territories
 as its choices.
->>> from django.contrib.localflavor.usa.forms import USStateSelect
+>>> from django.contrib.localflavor.us.forms import USStateSelect
 >>> w = USStateSelect()
 >>> print w.render('state', 'IL')
 <select name="state">
@@ -247,7 +247,7 @@ as its choices.
 </select>
 
 # USSocialSecurityNumberField #################################################
->>> from django.contrib.localflavor.usa.forms import USSocialSecurityNumberField
+>>> from django.contrib.localflavor.us.forms import USSocialSecurityNumberField
 >>> f = USSocialSecurityNumberField()
 >>> f.clean('987-65-4330')
 u'987-65-4330'