3 files changed, 0 insertions, 98 deletions
diff --git a/tests/regressiontests/localflavor/forms.py b/tests/regressiontests/localflavor/forms.py
index 49635b02fb..2dd1da6dd0 100644
--- a/tests/regressiontests/localflavor/forms.py
+++ b/tests/regressiontests/localflavor/forms.py
@@ -5,10 +5,3 @@ class PlaceForm(ModelForm):
     """docstring for PlaceForm"""
     class Meta:
         model = Place
-from django.forms import ModelForm
-from models import Place
-
-class PlaceForm(ModelForm):
-    """docstring for PlaceForm"""
-    class Meta:
-        model = Place
diff --git a/tests/regressiontests/localflavor/models.py b/tests/regressiontests/localflavor/models.py
index 079c7bd982..f74a5051d4 100644
--- a/tests/regressiontests/localflavor/models.py
+++ b/tests/regressiontests/localflavor/models.py
@@ -6,11 +6,3 @@ class Place(models.Model):
     state_req = USStateField()
     state_default = USStateField(default="CA", blank=True)
     name = models.CharField(max_length=20)
-from django.db import models
-from django.contrib.localflavor.us.models import USStateField
-
-class Place(models.Model):
-    state = USStateField(blank=True)
-    state_req = USStateField()
-    state_default = USStateField(default="CA", blank=True)
-    name = models.CharField(max_length=20)
diff --git a/tests/regressiontests/localflavor/tests.py b/tests/regressiontests/localflavor/tests.py
index 61e0e5b5e6..0ea3c52568 100644
--- a/tests/regressiontests/localflavor/tests.py
+++ b/tests/regressiontests/localflavor/tests.py
@@ -81,86 +81,3 @@ class USLocalflavorTests(TestCase):
 <option value="WY">Wyoming</option>
 </select>"""
         self.assertEqual(str(self.form['state']), state_select_html)
-from django.test import TestCase
-from models import Place
-from forms import PlaceForm
-
-class USLocalflavorTests(TestCase):
-    def setUp(self):
-        self.form = PlaceForm({'state':'GA', 'state_req':'NC', 'name':'impossible'})
-        
-    def test_get_display_methods(self):
-        """Test that the get_*_display() methods are added to the model instances."""
-        place = self.form.save()
-        self.assertEqual(place.get_state_display(), 'Georgia')
-        self.assertEqual(place.get_state_req_display(), 'North Carolina')
-    
-    def test_required(self):
-        """Test that required USStateFields throw appropriate errors."""
-        form = PlaceForm({'state':'GA', 'name':'Place in GA'})
-        self.assertFalse(form.is_valid())
-        self.assertEqual(form.errors['state_req'], [u'This field is required.'])
-    
-    def test_field_blank_option(self):
-        """Test that the empty option is there."""
-        state_select_html = """\
-<select name="state" id="id_state">
-<option value="">---------</option>
-<option value="AL">Alabama</option>
-<option value="AK">Alaska</option>
-<option value="AS">American Samoa</option>
-<option value="AZ">Arizona</option>
-<option value="AR">Arkansas</option>
-<option value="CA">California</option>
-<option value="CO">Colorado</option>
-<option value="CT">Connecticut</option>
-<option value="DE">Delaware</option>
-<option value="DC">District of Columbia</option>
-<option value="FL">Florida</option>
-<option value="GA" selected="selected">Georgia</option>
-<option value="GU">Guam</option>
-<option value="HI">Hawaii</option>
-<option value="ID">Idaho</option>
-<option value="IL">Illinois</option>
-<option value="IN">Indiana</option>
-<option value="IA">Iowa</option>
-<option value="KS">Kansas</option>
-<option value="KY">Kentucky</option>
-<option value="LA">Louisiana</option>
-<option value="ME">Maine</option>
-<option value="MD">Maryland</option>
-<option value="MA">Massachusetts</option>
-<option value="MI">Michigan</option>
-<option value="MN">Minnesota</option>
-<option value="MS">Mississippi</option>
-<option value="MO">Missouri</option>
-<option value="MT">Montana</option>
-<option value="NE">Nebraska</option>
-<option value="NV">Nevada</option>
-<option value="NH">New Hampshire</option>
-<option value="NJ">New Jersey</option>
-<option value="NM">New Mexico</option>
-<option value="NY">New York</option>
-<option value="NC">North Carolina</option>
-<option value="ND">North Dakota</option>
-<option value="MP">Northern Mariana Islands</option>
-<option value="OH">Ohio</option>
-<option value="OK">Oklahoma</option>
-<option value="OR">Oregon</option>
-<option value="PA">Pennsylvania</option>
-<option value="PR">Puerto Rico</option>
-<option value="RI">Rhode Island</option>
-<option value="SC">South Carolina</option>
-<option value="SD">South Dakota</option>
-<option value="TN">Tennessee</option>
-<option value="TX">Texas</option>
-<option value="UT">Utah</option>
-<option value="VT">Vermont</option>
-<option value="VI">Virgin Islands</option>
-<option value="VA">Virginia</option>
-<option value="WA">Washington</option>
-<option value="WV">West Virginia</option>
-<option value="WI">Wisconsin</option>
-<option value="WY">Wyoming</option>
-</select>"""
-        self.assertEqual(str(self.form['state']), state_select_html)