Ticket #5446: country_and_language_fields_trunk.20100409.patch

AUTHORS

@@ -113 +113 @@
     colin@owlfish.com
     crankycoder@gmail.com
     Paul Collier <paul@paul-collier.com>
+    Louis Cordier <lcordier@gmail.com>
     Robert Coup
     Pete Crosier <pete.crosier@gmail.com>
     Matt Croydon <http://www.postneo.com/>
@@ -285 +286 @@
     Rune Rønde Laursen <runerl@skjoldhoej.dk>
     Mark Lavin <markdlavin@gmail.com>
     Eugene Lazutkin <http://lazutkin.com/blog/>
-    lcordier@point45.com
+    Hector Lecuanda <hector+djdev@lecuanda.com>
     Jeong-Min Lee <falsetru@gmail.com>
     Tai Lee <real.human@mrmachine.net>
     Christopher Lenz <http://www.cmlenz.net/>

django/contrib/localflavor/generic/__init__.py

@@ +1 @@
+from django.utils.translation import ugettext as _
+from django.core.exceptions import ValidationError
+from django.conf import settings
+
+# Countries list - ISO 3166-1
+# http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+
+COUNTRIES = (
+    ('AD', _('Andorra')),
+    ('AE', _('United Arab Emirates')),
+    ('AF', _('Afghanistan')),
+    ('AG', _('Antigua & Barbuda')),
+    ('AI', _('Anguilla')),
+    ('AL', _('Albania')),
+    ('AM', _('Armenia')),
+    ('AN', _('Netherlands Antilles')),
+    ('AO', _('Angola')),
+    ('AQ', _('Antarctica')),
+    ('AR', _('Argentina')),
+    ('AS', _('American Samoa')),
+    ('AT', _('Austria')),
+    ('AU', _('Australia')),
+    ('AW', _('Aruba')),
+    ('AZ', _('Azerbaijan')),
+    ('BA', _('Bosnia and Herzegovina')),
+    ('BB', _('Barbados')),
+    ('BD', _('Bangladesh')),
+    ('BE', _('Belgium')),
+    ('BF', _('Burkina Faso')),
+    ('BG', _('Bulgaria')),
+    ('BH', _('Bahrain')),
+    ('BI', _('Burundi')),
+    ('BJ', _('Benin')),
+    ('BM', _('Bermuda')),
+    ('BN', _('Brunei Darussalam')),
+    ('BO', _('Bolivia')),
+    ('BR', _('Brazil')),
+    ('BS', _('Bahama')),
+    ('BT', _('Bhutan')),
+    ('BV', _('Bouvet Island')),
+    ('BW', _('Botswana')),
+    ('BY', _('Belarus')),
+    ('BZ', _('Belize')),
+    ('CA', _('Canada')),
+    ('CC', _('Cocos (Keeling) Islands')),
+    ('CF', _('Central African Republic')),
+    ('CG', _('Congo')),
+    ('CH', _('Switzerland')),
+    ('CI', _('Ivory Coast')),
+    ('CK', _('Cook Iislands')),
+    ('CL', _('Chile')),
+    ('CM', _('Cameroon')),
+    ('CN', _('China')),
+    ('CO', _('Colombia')),
+    ('CR', _('Costa Rica')),
+    ('CU', _('Cuba')),
+    ('CV', _('Cape Verde')),
+    ('CX', _('Christmas Island')),
+    ('CY', _('Cyprus')),
+    ('CZ', _('Czech Republic')),
+    ('DE', _('Germany')),
+    ('DJ', _('Djibouti')),
+    ('DK', _('Denmark')),
+    ('DM', _('Dominica')),
+    ('DO', _('Dominican Republic')),
+    ('DZ', _('Algeria')),
+    ('EC', _('Ecuador')),
+    ('EE', _('Estonia')),
+    ('EG', _('Egypt')),
+    ('EH', _('Western Sahara')),
+    ('ER', _('Eritrea')),
+    ('ES', _('Spain')),
+    ('ET', _('Ethiopia')),
+    ('FI', _('Finland')),
+    ('FJ', _('Fiji')),
+    ('FK', _('Falkland Islands (Malvinas)')),
+    ('FM', _('Micronesia')),
+    ('FO', _('Faroe Islands')),
+    ('FR', _('France')),
+    ('FX', _('France, Metropolitan')),
+    ('GA', _('Gabon')),
+    ('GB', _('United Kingdom (Great Britain)')),
+    ('GD', _('Grenada')),
+    ('GE', _('Georgia')),
+    ('GF', _('French Guiana')),
+    ('GH', _('Ghana')),
+    ('GI', _('Gibraltar')),
+    ('GL', _('Greenland')),
+    ('GM', _('Gambia')),
+    ('GN', _('Guinea')),
+    ('GP', _('Guadeloupe')),
+    ('GQ', _('Equatorial Guinea')),
+    ('GR', _('Greece')),
+    ('GS', _('South Georgia and the South Sandwich Islands')),
+    ('GT', _('Guatemala')),
+    ('GU', _('Guam')),
+    ('GW', _('Guinea-Bissau')),
+    ('GY', _('Guyana')),
+    ('HK', _('Hong Kong')),
+    ('HM', _('Heard & McDonald Islands')),
+    ('HN', _('Honduras')),
+    ('HR', _('Croatia')),
+    ('HT', _('Haiti')),
+    ('HU', _('Hungary')),
+    ('ID', _('Indonesia')),
+    ('IE', _('Ireland')),
+    ('IL', _('Israel')),
+    ('IN', _('India')),
+    ('IO', _('British Indian Ocean Territory')),
+    ('IQ', _('Iraq')),
+    ('IR', _('Islamic Republic of Iran')),
+    ('IS', _('Iceland')),
+    ('IT', _('Italy')),
+    ('JM', _('Jamaica')),
+    ('JO', _('Jordan')),
+    ('JP', _('Japan')),
+    ('KE', _('Kenya')),
+    ('KG', _('Kyrgyzstan')),
+    ('KH', _('Cambodia')),
+    ('KI', _('Kiribati')),
+    ('KM', _('Comoros')),
+    ('KN', _('St. Kitts and Nevis')),
+    ('KP', _('Korea, Democratic People\'s Republic of')),
+    ('KR', _('Korea, Republic of')),
+    ('KW', _('Kuwait')),
+    ('KY', _('Cayman Islands')),
+    ('KZ', _('Kazakhstan')),
+    ('LA', _('Lao People\'s Democratic Republic')),
+    ('LB', _('Lebanon')),
+    ('LC', _('Saint Lucia')),
+    ('LI', _('Liechtenstein')),
+    ('LK', _('Sri Lanka')),
+    ('LR', _('Liberia')),
+    ('LS', _('Lesotho')),
+    ('LT', _('Lithuania')),
+    ('LU', _('Luxembourg')),
+    ('LV', _('Latvia')),
+    ('LY', _('Libyan Arab Jamahiriya')),
+    ('MA', _('Morocco')),
+    ('MC', _('Monaco')),
+    ('MD', _('Moldova, Republic of')),
+    ('MG', _('Madagascar')),
+    ('MH', _('Marshall Islands')),
+    ('ML', _('Mali')),
+    ('MN', _('Mongolia')),
+    ('MM', _('Myanmar')),
+    ('MO', _('Macau')),
+    ('MP', _('Northern Mariana Islands')),
+    ('MQ', _('Martinique')),
+    ('MR', _('Mauritania')),
+    ('MS', _('Monserrat')),
+    ('MT', _('Malta')),
+    ('MU', _('Mauritius')),
+    ('MV', _('Maldives')),
+    ('MW', _('Malawi')),
+    ('MX', _('Mexico')),
+    ('MY', _('Malaysia')),
+    ('MZ', _('Mozambique')),
+    ('NA', _('Namibia')),
+    ('NC', _('New Caledonia')),
+    ('NE', _('Niger')),
+    ('NF', _('Norfolk Island')),
+    ('NG', _('Nigeria')),
+    ('NI', _('Nicaragua')),
+    ('NL', _('Netherlands')),
+    ('NO', _('Norway')),
+    ('NP', _('Nepal')),
+    ('NR', _('Nauru')),
+    ('NU', _('Niue')),
+    ('NZ', _('New Zealand')),
+    ('OM', _('Oman')),
+    ('PA', _('Panama')),
+    ('PE', _('Peru')),
+    ('PF', _('French Polynesia')),
+    ('PG', _('Papua New Guinea')),
+    ('PH', _('Philippines')),
+    ('PK', _('Pakistan')),
+    ('PL', _('Poland')),
+    ('PM', _('St. Pierre & Miquelon')),
+    ('PN', _('Pitcairn')),
+    ('PR', _('Puerto Rico')),
+    ('PT', _('Portugal')),
+    ('PW', _('Palau')),
+    ('PY', _('Paraguay')),
+    ('QA', _('Qatar')),
+    ('RE', _('Reunion')),
+    ('RO', _('Romania')),
+    ('RU', _('Russian Federation')),
+    ('RW', _('Rwanda')),
+    ('SA', _('Saudi Arabia')),
+    ('SB', _('Solomon Islands')),
+    ('SC', _('Seychelles')),
+    ('SD', _('Sudan')),
+    ('SE', _('Sweden')),
+    ('SG', _('Singapore')),
+    ('SH', _('St. Helena')),
+    ('SI', _('Slovenia')),
+    ('SJ', _('Svalbard & Jan Mayen Islands')),
+    ('SK', _('Slovakia')),
+    ('SL', _('Sierra Leone')),
+    ('SM', _('San Marino')),
+    ('SN', _('Senegal')),
+    ('SO', _('Somalia')),
+    ('SR', _('Suriname')),
+    ('ST', _('Sao Tome & Principe')),
+    ('SV', _('El Salvador')),
+    ('SY', _('Syrian Arab Republic')),
+    ('SZ', _('Swaziland')),
+    ('TC', _('Turks & Caicos Islands')),
+    ('TD', _('Chad')),
+    ('TF', _('French Southern Territories')),
+    ('TG', _('Togo')),
+    ('TH', _('Thailand')),
+    ('TJ', _('Tajikistan')),
+    ('TK', _('Tokelau')),
+    ('TM', _('Turkmenistan')),
+    ('TN', _('Tunisia')),
+    ('TO', _('Tonga')),
+    ('TP', _('East Timor')),
+    ('TR', _('Turkey')),
+    ('TT', _('Trinidad & Tobago')),
+    ('TV', _('Tuvalu')),
+    ('TW', _('Taiwan, Province of China')),
+    ('TZ', _('Tanzania, United Republic of')),
+    ('UA', _('Ukraine')),
+    ('UG', _('Uganda')),
+    ('UM', _('United States Minor Outlying Islands')),
+    ('US', _('United States of America')),
+    ('UY', _('Uruguay')),
+    ('UZ', _('Uzbekistan')),
+    ('VA', _('Vatican City State (Holy See)')),
+    ('VC', _('St. Vincent & the Grenadines')),
+    ('VE', _('Venezuela')),
+    ('VG', _('British Virgin Islands')),
+    ('VI', _('United States Virgin Islands')),
+    ('VN', _('Viet Nam')),
+    ('VU', _('Vanuatu')),
+    ('WF', _('Wallis & Futuna Islands')),
+    ('WS', _('Samoa')),
+    ('YE', _('Yemen')),
+    ('YT', _('Mayotte')),
+    ('YU', _('Yugoslavia')),
+    ('ZA', _('South Africa')),
+    ('ZM', _('Zambia')),
+    ('ZR', _('Zaire')),
+    ('ZW', _('Zimbabwe')),
+    ('ZZ', _('Unknown or unspecified country')),
+)
+
+def sorted_countries(countries):
+    """ Sort countries for a given language.
+        Assume ZZ is the last entry, keep it last.
+    """
+    c = list(countries[:-1])
+    c.sort(key=lambda x: x[1])
+    c.append(countries[-1])
+    return(tuple(c))
+
+COUNTRIES = sorted_countries(COUNTRIES)
+
+def isValidLanguage(field_data, all_data):
+    if not field_data in [lang[0] for lang in settings.LANGUAGES]:
+        raise ValidationError, _("This value must be in LANGUAGES setting in settings.py module.")
+
+def isValidCountry(field_data, all_data):
+    if not field_data in [lang[0] for lang in COUNTRIES]:
+        raise ValidationError, _("This value must be in COUNTRIES setting in localflavor.generic package.")

new file django/contrib/localflavor/generic/models.py

@@ +1 @@
+from django.db.models.fields import CharField
+
+class CountryField(CharField):
+    def __init__(self, *args, **kwargs):
+        from django.contrib.localflavor.generic import COUNTRIES
+
+        kwargs.setdefault('max_length', 2)
+        kwargs.setdefault('choices', COUNTRIES)
+
+        super(CharField, self).__init__(*args, **kwargs)
+
+    def get_internal_type(self):
+        return "CharField"
+
+class LanguageField(CharField):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault('max_length', 5)
+        super(CharField, self).__init__(*args, **kwargs)
+
+    def get_internal_type(self):
+        return "CharField"

docs/ref/contrib/localflavor.txt

@@ -117 +117 @@
 .. _United States of America: `United States of America (us)`_
 .. _Uruguay: `Uruguay (uy)`_
 
+The generic subpackage also defines a `CountryField` and a `LanguageField` that 
+you can use in your models. They render as a Drop Down and store the ISO-3166 
+code in your database.
+
+``CountryField``
+----------------
+
+.. class:: CountryField(max_length=2, [**options])
+
+A country field, an uppercase two-letter ISO 3166-1 standard country code.
+Countries are defined in `django.contrib.localflavor.generic.COUNTRIES`.
+See also: `Country Code List`_
+
+.. _`Country Code List`: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+
+``LanguageField``
+-----------------
+
+.. class:: LanguageField([**options])
+
+A language code. Generally you would check languages against
+``settings.LANGUAGES``.
+
+
 Adding flavors
 ==============
 

tests/regressiontests/forms/localflavor/generic.py

@@ -160 +160 @@
 >>> repr(f.clean(''))
 'None'
 
+# CountryField ################################################################
+Create a Model and a Form Model that uses CountryField from localflavor.generic
+then check the widget and choices
+
+>>> from django.db import models
+>>> from django.forms import ModelForm
+>>> from django.contrib.localflavor.us.models import USStateField
+>>> from django.contrib.localflavor.generic.models import CountryField
+>>> class WorldPlace(models.Model):
+...     country = CountryField(blank=True)
+...     country_req = CountryField()
+...     country_default = CountryField(default="MX", blank=True)
+...     name = models.CharField(max_length=20)
+...
+...     class Meta:
+...         app_label = 'someapp'
+...
+>>> class WorldPlaceForm(ModelForm):
+...     class Meta:
+...         model = WorldPlace
+...
+>>> form = WorldPlaceForm()
+>>> form.fields['country'].widget.__class__
+<class 'django.forms.widgets.Select'>
+>>> form.fields['country']._choices
+[('', '---------'), ('AF', u'Afghanistan'), ('AL', u'Albania'), ('DZ', u'Algeria'), ('AS', u'American Samoa'), ('AD', u'Andorra'), ('AO', u'Angola'), ('AI', u'Anguilla'), ('AQ', u'Antarctica'), ('AG', u'Antigua & Barbuda'), ('AR', u'Argentina'), ('AM', u'Armenia'), ('AW', u'Aruba'), ('AU', u'Australia'), ('AT', u'Austria'), ('AZ', u'Azerbaijan'), ('BS', u'Bahama'), ('BH', u'Bahrain'), ('BD', u'Bangladesh'), ('BB', u'Barbados'), ('BY', u'Belarus'), ('BE', u'Belgium'), ('BZ', u'Belize'), ('BJ', u'Benin'), ('BM', u'Bermuda'), ('BT', u'Bhutan'), ('BO', u'Bolivia'), ('BA', u'Bosnia and Herzegovina'), ('BW', u'Botswana'), ('BV', u'Bouvet Island'), ('BR', u'Brazil'), ('IO', u'British Indian Ocean Territory'), ('VG', u'British Virgin Islands'), ('BN', u'Brunei Darussalam'), ('BG', u'Bulgaria'), ('BF', u'Burkina Faso'), ('BI', u'Burundi'), ('KH', u'Cambodia'), ('CM', u'Cameroon'), ('CA', u'Canada'), ('CV', u'Cape Verde'), ('KY', u'Cayman Islands'), ('CF', u'Central African Republic'), ('TD', u'Chad'), ('CL', u'Chile'), ('CN', u'China'), ('CX', u'Christmas Island'), ('CC', u'Cocos (Keeling) Islands'), ('CO', u'Colombia'), ('KM', u'Comoros'), ('CG', u'Congo'), ('CK', u'Cook Iislands'), ('CR', u'Costa Rica'), ('HR', u'Croatia'), ('CU', u'Cuba'), ('CY', u'Cyprus'), ('CZ', u'Czech Republic'), ('DK', u'Denmark'), ('DJ', u'Djibouti'), ('DM', u'Dominica'), ('DO', u'Dominican Republic'), ('TP', u'East Timor'), ('EC', u'Ecuador'), ('EG', u'Egypt'), ('SV', u'El Salvador'), ('GQ', u'Equatorial Guinea'), ('ER', u'Eritrea'), ('EE', u'Estonia'), ('ET', u'Ethiopia'), ('FK', u'Falkland Islands (Malvinas)'), ('FO', u'Faroe Islands'), ('FJ', u'Fiji'), ('FI', u'Finland'), ('FR', u'France'), ('FX', u'France, Metropolitan'), ('GF', u'French Guiana'), ('PF', u'French Polynesia'), ('TF', u'French Southern Territories'), ('GA', u'Gabon'), ('GM', u'Gambia'), ('GE', u'Georgia'), ('DE', u'Germany'), ('GH', u'Ghana'), ('GI', u'Gibraltar'), ('GR', u'Greece'), ('GL', u'Greenland'), ('GD', u'Grenada'), ('GP', u'Guadeloupe'), ('GU', u'Guam'), ('GT', u'Guatemala'), ('GN', u'Guinea'), ('GW', u'Guinea-Bissau'), ('GY', u'Guyana'), ('HT', u'Haiti'), ('HM', u'Heard & McDonald Islands'), ('HN', u'Honduras'), ('HK', u'Hong Kong'), ('HU', u'Hungary'), ('IS', u'Iceland'), ('IN', u'India'), ('ID', u'Indonesia'), ('IQ', u'Iraq'), ('IE', u'Ireland'), ('IR', u'Islamic Republic of Iran'), ('IL', u'Israel'), ('IT', u'Italy'), ('CI', u'Ivory Coast'), ('JM', u'Jamaica'), ('JP', u'Japan'), ('JO', u'Jordan'), ('KZ', u'Kazakhstan'), ('KE', u'Kenya'), ('KI', u'Kiribati'), ('KP', u"Korea, Democratic People's Republic of"), ('KR', u'Korea, Republic of'), ('KW', u'Kuwait'), ('KG', u'Kyrgyzstan'), ('LA', u"Lao People's Democratic Republic"), ('LV', u'Latvia'), ('LB', u'Lebanon'), ('LS', u'Lesotho'), ('LR', u'Liberia'), ('LY', u'Libyan Arab Jamahiriya'), ('LI', u'Liechtenstein'), ('LT', u'Lithuania'), ('LU', u'Luxembourg'), ('MO', u'Macau'), ('MG', u'Madagascar'), ('MW', u'Malawi'), ('MY', u'Malaysia'), ('MV', u'Maldives'), ('ML', u'Mali'), ('MT', u'Malta'), ('MH', u'Marshall Islands'), ('MQ', u'Martinique'), ('MR', u'Mauritania'), ('MU', u'Mauritius'), ('YT', u'Mayotte'), ('MX', u'Mexico'), ('FM', u'Micronesia'), ('MD', u'Moldova, Republic of'), ('MC', u'Monaco'), ('MN', u'Mongolia'), ('MS', u'Monserrat'), ('MA', u'Morocco'), ('MZ', u'Mozambique'), ('MM', u'Myanmar'), ('NA', u'Namibia'), ('NR', u'Nauru'), ('NP', u'Nepal'), ('NL', u'Netherlands'), ('AN', u'Netherlands Antilles'), ('NC', u'New Caledonia'), ('NZ', u'New Zealand'), ('NI', u'Nicaragua'), ('NE', u'Niger'), ('NG', u'Nigeria'), ('NU', u'Niue'), ('NF', u'Norfolk Island'), ('MP', u'Northern Mariana Islands'), ('NO', u'Norway'), ('OM', u'Oman'), ('PK', u'Pakistan'), ('PW', u'Palau'), ('PA', u'Panama'), ('PG', u'Papua New Guinea'), ('PY', u'Paraguay'), ('PE', u'Peru'), ('PH', u'Philippines'), ('PN', u'Pitcairn'), ('PL', u'Poland'), ('PT', u'Portugal'), ('PR', u'Puerto Rico'), ('QA', u'Qatar'), ('RE', u'Reunion'), ('RO', u'Romania'), ('RU', u'Russian Federation'), ('RW', u'Rwanda'), ('LC', u'Saint Lucia'), ('WS', u'Samoa'), ('SM', u'San Marino'), ('ST', u'Sao Tome & Principe'), ('SA', u'Saudi Arabia'), ('SN', u'Senegal'), ('SC', u'Seychelles'), ('SL', u'Sierra Leone'), ('SG', u'Singapore'), ('SK', u'Slovakia'), ('SI', u'Slovenia'), ('SB', u'Solomon Islands'), ('SO', u'Somalia'), ('ZA', u'South Africa'), ('GS', u'South Georgia and the South Sandwich Islands'), ('ES', u'Spain'), ('LK', u'Sri Lanka'), ('SH', u'St. Helena'), ('KN', u'St. Kitts and Nevis'), ('PM', u'St. Pierre & Miquelon'), ('VC', u'St. Vincent & the Grenadines'), ('SD', u'Sudan'), ('SR', u'Suriname'), ('SJ', u'Svalbard & Jan Mayen Islands'), ('SZ', u'Swaziland'), ('SE', u'Sweden'), ('CH', u'Switzerland'), ('SY', u'Syrian Arab Republic'), ('TW', u'Taiwan, Province of China'), ('TJ', u'Tajikistan'), ('TZ', u'Tanzania, United Republic of'), ('TH', u'Thailand'), ('TG', u'Togo'), ('TK', u'Tokelau'), ('TO', u'Tonga'), ('TT', u'Trinidad & Tobago'), ('TN', u'Tunisia'), ('TR', u'Turkey'), ('TM', u'Turkmenistan'), ('TC', u'Turks & Caicos Islands'), ('TV', u'Tuvalu'), ('UG', u'Uganda'), ('UA', u'Ukraine'), ('AE', u'United Arab Emirates'), ('GB', u'United Kingdom (Great Britain)'), ('UM', u'United States Minor Outlying Islands'), ('VI', u'United States Virgin Islands'), ('US', u'United States of America'), ('UY', u'Uruguay'), ('UZ', u'Uzbekistan'), ('VU', u'Vanuatu'), ('VA', u'Vatican City State (Holy See)'), ('VE', u'Venezuela'), ('VN', u'Viet Nam'), ('WF', u'Wallis & Futuna Islands'), ('EH', u'Western Sahara'), ('YE', u'Yemen'), ('YU', u'Yugoslavia'), ('ZR', u'Zaire'), ('ZM', u'Zambia'), ('ZW', u'Zimbabwe'), ('ZZ', u'Unknown or unspecified country')]
 """

tests/regressiontests/localflavor/forms.py

@@ -1 +1 @@
 from django.forms import ModelForm
-from models import Place
+from models import Place, WorldPlace
 
 class PlaceForm(ModelForm):
     """docstring for PlaceForm"""
     class Meta:
         model = Place
+
+class WorldPlaceForm(ModelForm):
+    """docstring for WorldPlaceForm"""
+    class Meta:
+        model = WorldPlace

tests/regressiontests/localflavor/models.py

@@ -1 +1 @@
 from django.db import models
 from django.contrib.localflavor.us.models import USStateField
+from django.contrib.localflavor.generic.models import CountryField
 
 class Place(models.Model):
     state = USStateField(blank=True)
     state_req = USStateField()
     state_default = USStateField(default="CA", blank=True)
     name = models.CharField(max_length=20)
+
+class WorldPlace(models.Model):
+    country = CountryField(blank=True)
+    country_req = CountryField()
+    country_default = CountryField(default="MX", blank=True)
+    name = models.CharField(max_length=20)
+ 
+    class Meta:
+        app_label = 'someapp'

tests/regressiontests/localflavor/tests.py

@@ -7 +7 @@
         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>
@@ -81 +78 @@
 <option value="WY">Wyoming</option>
 </select>"""
         self.assertEqual(str(self.form['state']), state_select_html)
+
+class GenericLocalFlavorTests(TestCase):
+    def setUp(self):
+        self.form = WorldPlaceForm({'country':'MX', 'country_req':'DE', 'name':'whynot'})
+        worldplace = self.form.save()
+        self.assertEqual(place.get_state_display(), 'Mexico')
+        self.assertEqual(place.get_state_req_display(), 'Germany')
+
+    def test_required(self):
+        form = PlaceForm({'country':'MX', 'name':'Place in Mexico'})
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors['country_req'], [u'This field is required.'])

tests/regressiontests/serializers_regress/models.py

@@ -9 +9 @@
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.localflavor.us.models import USStateField, PhoneNumberField
+from django.contrib.localflavor.generic.models import CountryField
 
 # The following classes are for testing basic data
 # marshalling, including NULL values, where allowed.
@@ -79 +80 @@
 class USStateData(models.Model):
     data = USStateField(null=True)
 
+class CountryData(models.Model):
+    data = CountryField(null=True)
+
 class XMLData(models.Model):
     data = models.XMLField(null=True)