Added buildout stuff and made changes accordingly

--HG--
rename : profile/management/__init__.py => eggs/djangorecipe-0.20-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/djangorecipe-0.20-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/infrae.subversion-1.4.5-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/infrae.subversion-1.4.5-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/mercurial-1.7.3-py2.6-linux-x86_64.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/mercurial-1.7.3-py2.6-linux-x86_64.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/py-1.4.0-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/py-1.4.0-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/zc.buildout-1.5.2-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/zc.buildout-1.5.2-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/zc.recipe.egg-1.3.2-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/zc.recipe.egg-1.3.2-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => parts/django/Django.egg-info/dependency_links.txt
rename : taskapp/models.py => parts/django/django/conf/app_template/models.py
rename : taskapp/tests.py => parts/django/django/conf/app_template/tests.py
rename : taskapp/views.py => parts/django/django/conf/app_template/views.py
rename : taskapp/views.py => parts/django/django/contrib/gis/tests/geo3d/views.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/delete/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/files/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/invalid_models/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/m2m_signals/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/model_package/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/management/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/management/commands/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/models.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/delete_regress/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/file_storage/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/max_lengths/__init__.py
rename : profile/forms.py => pytask/profile/forms.py
rename : profile/management/__init__.py => pytask/profile/management/__init__.py
rename : profile/management/commands/seed_db.py => pytask/profile/management/commands/seed_db.py
rename : profile/models.py => pytask/profile/models.py
rename : profile/templatetags/user_tags.py => pytask/profile/templatetags/user_tags.py
rename : taskapp/tests.py => pytask/profile/tests.py
rename : profile/urls.py => pytask/profile/urls.py
rename : profile/utils.py => pytask/profile/utils.py
rename : profile/views.py => pytask/profile/views.py
rename : static/css/base.css => pytask/static/css/base.css
rename : taskapp/tests.py => pytask/taskapp/tests.py
rename : taskapp/views.py => pytask/taskapp/views.py
rename : templates/base.html => pytask/templates/base.html
rename : templates/profile/browse_notifications.html => pytask/templates/profile/browse_notifications.html
rename : templates/profile/edit.html => pytask/templates/profile/edit.html
rename : templates/profile/view.html => pytask/templates/profile/view.html
rename : templates/profile/view_notification.html => pytask/templates/profile/view_notification.html
rename : templates/registration/activate.html => pytask/templates/registration/activate.html
rename : templates/registration/activation_email.txt => pytask/templates/registration/activation_email.txt
rename : templates/registration/activation_email_subject.txt => pytask/templates/registration/activation_email_subject.txt
rename : templates/registration/logged_out.html => pytask/templates/registration/logged_out.html
rename : templates/registration/login.html => pytask/templates/registration/login.html
rename : templates/registration/logout.html => pytask/templates/registration/logout.html
rename : templates/registration/password_change_done.html => pytask/templates/registration/password_change_done.html
rename : templates/registration/password_change_form.html => pytask/templates/registration/password_change_form.html
rename : templates/registration/password_reset_complete.html => pytask/templates/registration/password_reset_complete.html
rename : templates/registration/password_reset_confirm.html => pytask/templates/registration/password_reset_confirm.html
rename : templates/registration/password_reset_done.html => pytask/templates/registration/password_reset_done.html
rename : templates/registration/password_reset_email.html => pytask/templates/registration/password_reset_email.html
rename : templates/registration/password_reset_form.html => pytask/templates/registration/password_reset_form.html
rename : templates/registration/registration_complete.html => pytask/templates/registration/registration_complete.html
rename : templates/registration/registration_form.html => pytask/templates/registration/registration_form.html
rename : utils.py => pytask/utils.py

47 files changed, 10695 insertions, 0 deletions

diff --git a/parts/django/tests/regressiontests/forms/__init__.py b/parts/django/tests/regressiontests/forms/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/__init__.py
diff --git a/parts/django/tests/regressiontests/forms/localflavor/__init__.py b/parts/django/tests/regressiontests/forms/localflavor/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/__init__.py
diff --git a/parts/django/tests/regressiontests/forms/localflavor/ar.py b/parts/django/tests/regressiontests/forms/localflavor/ar.py
new file mode 100644
index 0000000..9c67269
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/ar.py
@@ -0,0 +1,99 @@
+from django.contrib.localflavor.ar.forms import (ARProvinceSelect,
+    ARPostalCodeField, ARDNIField, ARCUITField)
+
+from utils import LocalFlavorTestCase
+
+
+class ARLocalFlavorTests(LocalFlavorTestCase):
+    def test_ARProvinceSelect(self):
+        f = ARProvinceSelect()
+        out = u'''<select name="provincias">
+<option value="B">Buenos Aires</option>
+<option value="K">Catamarca</option>
+<option value="H">Chaco</option>
+<option value="U">Chubut</option>
+<option value="C">Ciudad Aut\xf3noma de Buenos Aires</option>
+<option value="X">C\xf3rdoba</option>
+<option value="W">Corrientes</option>
+<option value="E">Entre R\xedos</option>
+<option value="P">Formosa</option>
+<option value="Y">Jujuy</option>
+<option value="L">La Pampa</option>
+<option value="F">La Rioja</option>
+<option value="M">Mendoza</option>
+<option value="N">Misiones</option>
+<option value="Q">Neuqu\xe9n</option>
+<option value="R">R\xedo Negro</option>
+<option value="A" selected="selected">Salta</option>
+<option value="J">San Juan</option>
+<option value="D">San Luis</option>
+<option value="Z">Santa Cruz</option>
+<option value="S">Santa Fe</option>
+<option value="G">Santiago del Estero</option>
+<option value="V">Tierra del Fuego, Ant\xe1rtida e Islas del Atl\xe1ntico Sur</option>
+<option value="T">Tucum\xe1n</option>
+</select>'''
+        self.assertEqual(f.render('provincias', 'A'), out)
+
+    def test_ARPostalCodeField(self):
+        error_format = [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+        error_atmost = [u'Ensure this value has at most 8 characters (it has 9).']
+        error_atleast = [u'Ensure this value has at least 4 characters (it has 3).']
+        valid = {
+            '5000': '5000',
+            'C1064AAB': 'C1064AAB',
+            'c1064AAB': 'C1064AAB',
+            'C1064aab': 'C1064AAB',
+            '4400': '4400',
+            u'C1064AAB': 'C1064AAB',
+        }
+        invalid = {
+            'C1064AABB': error_atmost + error_format,
+            'C1064AA': error_format,
+            'C1064AB': error_format,
+            '106AAB': error_format,
+            '500': error_atleast + error_format,
+            '5PPP': error_format,
+        }
+        self.assertFieldOutput(ARPostalCodeField, valid, invalid)
+
+    def test_ARDNIField(self):
+        error_length = [u'This field requires 7 or 8 digits.']
+        error_digitsonly = [u'This field requires only numbers.']
+        valid = {
+            '20123456': '20123456',
+            '20.123.456': '20123456',
+            u'20123456': '20123456',
+            u'20.123.456': '20123456',
+            '20.123456': '20123456',
+            '9123456': '9123456',
+            '9.123.456': '9123456',
+        }
+        invalid = {
+            '101234566': error_length,
+            'W0123456': error_digitsonly,
+            '10,123,456': error_digitsonly,
+        }
+        self.assertFieldOutput(ARDNIField, valid, invalid)
+
+    def test_ARCUITField(self):
+        error_format = [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.']
+        error_invalid = [u'Invalid CUIT.']
+        valid = {
+            '20-10123456-9': '20-10123456-9',
+            u'20-10123456-9': '20-10123456-9',
+            '27-10345678-4': '27-10345678-4',
+            '20101234569': '20-10123456-9',
+            '27103456784': '27-10345678-4',
+        }
+        invalid = {
+            '2-10123456-9': error_format,
+            '210123456-9': error_format,
+            '20-10123456': error_format,
+            '20-10123456-': error_format,
+             '20-10123456-5': error_invalid,
+            '2-10123456-9': error_format,
+             '27-10345678-1': error_invalid,
+             u'27-10345678-1': error_invalid,
+        }
+        self.assertFieldOutput(ARCUITField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/at.py b/parts/django/tests/regressiontests/forms/localflavor/at.py
new file mode 100644
index 0000000..3fa50ac
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/at.py
@@ -0,0 +1,45 @@
+from django.contrib.localflavor.at.forms import (ATZipCodeField, ATStateSelect,
+    ATSocialSecurityNumberField)
+
+from utils import LocalFlavorTestCase
+
+
+class ATLocalFlavorTests(LocalFlavorTestCase):
+    def test_ATStateSelect(self):
+        f = ATStateSelect()
+        out = u'''<select name="bundesland">
+<option value="BL">Burgenland</option>
+<option value="KA">Carinthia</option>
+<option value="NO">Lower Austria</option>
+<option value="OO">Upper Austria</option>
+<option value="SA">Salzburg</option>
+<option value="ST">Styria</option>
+<option value="TI">Tyrol</option>
+<option value="VO">Vorarlberg</option>
+<option value="WI" selected="selected">Vienna</option>
+</select>'''
+        self.assertEqual(f.render('bundesland', 'WI'), out)
+
+    def test_ATZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXX.']
+        valid = {
+            '1150': '1150',
+            '4020': '4020',
+            '8020': '8020',
+        }
+        invalid = {
+            '111222': error_format,
+            'eeffee': error_format,
+        }
+        self.assertFieldOutput(ATZipCodeField, valid, invalid)
+
+    def test_ATSocialSecurityNumberField(self):
+        error_format = [u'Enter a valid Austrian Social Security Number in XXXX XXXXXX format.']
+        valid = {
+            '1237 010180': '1237 010180',
+        }
+        invalid = {
+            '1237 010181': error_format,
+            '12370 010180': error_format,
+        }
+        self.assertFieldOutput(ATSocialSecurityNumberField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/au.py b/parts/django/tests/regressiontests/forms/localflavor/au.py
new file mode 100644
index 0000000..4bd8a76
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/au.py
@@ -0,0 +1,50 @@
+from django.contrib.localflavor.au.forms import (AUPostCodeField,
+        AUPhoneNumberField, AUStateSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class AULocalFlavorTests(LocalFlavorTestCase):
+    def test_AUStateSelect(self):
+        f = AUStateSelect()
+        out = u'''<select name="state">
+<option value="ACT">Australian Capital Territory</option>
+<option value="NSW" selected="selected">New South Wales</option>
+<option value="NT">Northern Territory</option>
+<option value="QLD">Queensland</option>
+<option value="SA">South Australia</option>
+<option value="TAS">Tasmania</option>
+<option value="VIC">Victoria</option>
+<option value="WA">Western Australia</option>
+</select>'''
+        self.assertEqual(f.render('state', 'NSW'), out)
+
+    def test_AUPostCodeField(self):
+        error_format = [u'Enter a 4 digit post code.']
+        valid = {
+            '1234': '1234',
+            '2000': '2000',
+        }
+        invalid = {
+            'abcd': error_format,
+            '20001': error_format,
+        }
+        self.assertFieldOutput(AUPostCodeField, valid, invalid)
+
+    def test_AUPhoneNumberField(self):
+        error_format = [u'Phone numbers must contain 10 digits.']
+        valid = {
+            '1234567890': '1234567890',
+            '0213456789': '0213456789',
+            '02 13 45 67 89': '0213456789',
+            '(02) 1345 6789': '0213456789',
+            '(02) 1345-6789': '0213456789',
+            '(02)1345-6789': '0213456789',
+            '0408 123 456': '0408123456',
+        }
+        invalid = {
+            '123': error_format,
+            '1800DJANGO': error_format,
+        }
+        self.assertFieldOutput(AUPhoneNumberField, valid, invalid)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/br.py b/parts/django/tests/regressiontests/forms/localflavor/br.py
new file mode 100644
index 0000000..6ae7105
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/br.py
@@ -0,0 +1,144 @@
+from django.contrib.localflavor.br.forms import (BRZipCodeField,
+    BRCNPJField, BRCPFField, BRPhoneNumberField, BRStateSelect,
+    BRStateChoiceField)
+
+from utils import LocalFlavorTestCase
+
+
+class BRLocalFlavorTests(LocalFlavorTestCase):
+    def test_BRZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXXX-XXX.']
+        valid = {
+            '12345-123': '12345-123',
+        }
+        invalid = {
+            '12345_123': error_format,
+            '1234-123': error_format,
+            'abcde-abc': error_format,
+            '12345-': error_format,
+            '-123': error_format,
+        }
+        self.assertFieldOutput(BRZipCodeField, valid, invalid)
+
+    def test_BRCNPJField(self):
+        error_format = [u'Invalid CNPJ number.']
+        error_numbersonly = [u'This field requires only numbers.']
+        valid = {
+            '64.132.916/0001-88': '64.132.916/0001-88',
+            '64-132-916/0001-88': '64-132-916/0001-88',
+            '64132916/0001-88': '64132916/0001-88',
+        }
+        invalid = {
+            '12-345-678/9012-10': error_format,
+            '12.345.678/9012-10': error_format,
+            '12345678/9012-10': error_format,
+            '64.132.916/0001-XX': error_numbersonly,
+        }
+        self.assertFieldOutput(BRCNPJField, valid, invalid)
+
+    def test_BRCPFField(self):
+        error_format = [u'Invalid CPF number.']
+        error_numbersonly = [u'This field requires only numbers.']
+        error_atmost_chars = [u'Ensure this value has at most 14 characters (it has 15).']
+        error_atleast_chars = [u'Ensure this value has at least 11 characters (it has 10).']
+        error_atmost = [u'This field requires at most 11 digits or 14 characters.']
+        valid = {
+            '663.256.017-26': '663.256.017-26',
+            '66325601726': '66325601726',
+            '375.788.573-20': '375.788.573-20',
+            '84828509895': '84828509895',
+        }
+        invalid = {
+            '489.294.654-54': error_format,
+            '295.669.575-98': error_format,
+            '539.315.127-22': error_format,
+            '375.788.573-XX': error_numbersonly,
+            '375.788.573-000': error_atmost_chars,
+            '123.456.78': error_atleast_chars,
+            '123456789555': error_atmost,
+        }
+        self.assertFieldOutput(BRCPFField, valid, invalid)
+
+    def test_BRPhoneNumberField(self):
+        # TODO: this doesn't test for any invalid inputs.
+        valid = {
+            '41-3562-3464': u'41-3562-3464',
+            '4135623464': u'41-3562-3464',
+            '41 3562-3464': u'41-3562-3464',
+            '41 3562 3464': u'41-3562-3464',
+            '(41) 3562 3464': u'41-3562-3464',
+            '41.3562.3464': u'41-3562-3464',
+            '41.3562-3464': u'41-3562-3464',
+            ' (41) 3562.3464': u'41-3562-3464',
+        }
+        invalid = {}
+        self.assertFieldOutput(BRPhoneNumberField, valid, invalid)
+
+    def test_BRStateSelect(self):
+        f = BRStateSelect()
+        out = u'''<select name="states">
+<option value="AC">Acre</option>
+<option value="AL">Alagoas</option>
+<option value="AP">Amap\xe1</option>
+<option value="AM">Amazonas</option>
+<option value="BA">Bahia</option>
+<option value="CE">Cear\xe1</option>
+<option value="DF">Distrito Federal</option>
+<option value="ES">Esp\xedrito Santo</option>
+<option value="GO">Goi\xe1s</option>
+<option value="MA">Maranh\xe3o</option>
+<option value="MT">Mato Grosso</option>
+<option value="MS">Mato Grosso do Sul</option>
+<option value="MG">Minas Gerais</option>
+<option value="PA">Par\xe1</option>
+<option value="PB">Para\xedba</option>
+<option value="PR" selected="selected">Paran\xe1</option>
+<option value="PE">Pernambuco</option>
+<option value="PI">Piau\xed</option>
+<option value="RJ">Rio de Janeiro</option>
+<option value="RN">Rio Grande do Norte</option>
+<option value="RS">Rio Grande do Sul</option>
+<option value="RO">Rond\xf4nia</option>
+<option value="RR">Roraima</option>
+<option value="SC">Santa Catarina</option>
+<option value="SP">S\xe3o Paulo</option>
+<option value="SE">Sergipe</option>
+<option value="TO">Tocantins</option>
+</select>'''
+        self.assertEqual(f.render('states', 'PR'), out)
+
+    def test_BRStateChoiceField(self):
+        error_invalid = [u'Select a valid brazilian state. That state is not one of the available states.']
+        valid = {
+            'AC': 'AC',
+            'AL': 'AL',
+            'AP': 'AP',
+            'AM': 'AM',
+            'BA': 'BA',
+            'CE': 'CE',
+            'DF': 'DF',
+            'ES': 'ES',
+            'GO': 'GO',
+            'MA': 'MA',
+            'MT': 'MT',
+            'MS': 'MS',
+            'MG': 'MG',
+            'PA': 'PA',
+            'PB': 'PB',
+            'PR': 'PR',
+            'PE': 'PE',
+            'PI': 'PI',
+            'RJ': 'RJ',
+            'RN': 'RN',
+            'RS': 'RS',
+            'RO': 'RO',
+            'RR': 'RR',
+            'SC': 'SC',
+            'SP': 'SP',
+            'SE': 'SE',
+            'TO': 'TO',
+        }
+        invalid = {
+            'pr': error_invalid,
+        }
+        self.assertFieldOutput(BRStateChoiceField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/ca.py b/parts/django/tests/regressiontests/forms/localflavor/ca.py
new file mode 100644
index 0000000..575f41c
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/ca.py
@@ -0,0 +1,95 @@
+from django.contrib.localflavor.ca.forms import (CAPostalCodeField,
+        CAPhoneNumberField, CAProvinceField, CAProvinceSelect,
+        CASocialInsuranceNumberField)
+
+from utils import LocalFlavorTestCase
+
+
+class CALocalFlavorTests(LocalFlavorTestCase):
+    def test_CAProvinceSelect(self):
+        f = CAProvinceSelect()
+        out = u'''<select name="province">
+<option value="AB" selected="selected">Alberta</option>
+<option value="BC">British Columbia</option>
+<option value="MB">Manitoba</option>
+<option value="NB">New Brunswick</option>
+<option value="NF">Newfoundland and Labrador</option>
+<option value="NT">Northwest Territories</option>
+<option value="NS">Nova Scotia</option>
+<option value="NU">Nunavut</option>
+<option value="ON">Ontario</option>
+<option value="PE">Prince Edward Island</option>
+<option value="QC">Quebec</option>
+<option value="SK">Saskatchewan</option>
+<option value="YK">Yukon</option>
+</select>'''
+        self.assertEqual(f.render('province', 'AB'), out)
+
+    def test_CAPostalCodeField(self):
+        error_format = [u'Enter a postal code in the format XXX XXX.']
+        valid = {
+            'T2S 2H7': 'T2S 2H7',
+            'T2S 2W7': 'T2S 2W7',
+            'T2S 2Z7': 'T2S 2Z7',
+            'T2Z 2H7': 'T2Z 2H7',
+
+        }
+        invalid = {
+            'T2S2H7' : error_format,
+            'T2S 2H' : error_format,
+            '2T6 H8I': error_format,
+            'T2S2H' : error_format,
+            90210 : error_format,
+            'W2S 2H3': error_format,
+            'Z2S 2H3': error_format,
+            'F2S 2H3': error_format,
+            'A2S 2D3': error_format,
+            'A2I 2R3': error_format,
+            'A2Q 2R3': error_format,
+            'U2B 2R3': error_format,
+            'O2B 2R3': error_format,
+        }
+        self.assertFieldOutput(CAPostalCodeField, valid, invalid)
+
+    def test_CAPhoneNumberField(self):
+        error_format = [u'Phone numbers must be in XXX-XXX-XXXX format.']
+        valid = {
+            '403-555-1212': '403-555-1212',
+            '4035551212': '403-555-1212',
+            '403 555-1212': '403-555-1212',
+            '(403) 555-1212': '403-555-1212',
+            '403 555 1212': '403-555-1212',
+            '403.555.1212': '403-555-1212',
+            '403.555-1212': '403-555-1212',
+            ' (403) 555.1212 ': '403-555-1212',
+        }
+        invalid = {
+           '555-1212': error_format,
+           '403-55-1212': error_format,
+        }
+        self.assertFieldOutput(CAPhoneNumberField, valid, invalid)
+
+    def test_CAProvinceField(self):
+        error_format = [u'Enter a Canadian province or territory.']
+        valid = {
+            'ab': 'AB',
+            'BC': 'BC',
+            'nova scotia': 'NS',
+            '  manitoba ': 'MB',
+        }
+        invalid = {
+            'T2S 2H7': error_format,
+        }
+        self.assertFieldOutput(CAProvinceField, valid, invalid)
+
+    def test_CASocialInsuranceField(self):
+        error_format = [u'Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format.']
+        valid = {
+            '046-454-286': '046-454-286',
+        }
+        invalid = {
+            '046-454-287': error_format,
+            '046 454 286': error_format,
+            '046-44-286': error_format,
+        }
+        self.assertFieldOutput(CASocialInsuranceNumberField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/ch.py b/parts/django/tests/regressiontests/forms/localflavor/ch.py
new file mode 100644
index 0000000..c67bfcf
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/ch.py
@@ -0,0 +1,75 @@
+from django.contrib.localflavor.ch.forms import (CHZipCodeField,
+    CHPhoneNumberField, CHIdentityCardNumberField, CHStateSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class CHLocalFlavorTests(LocalFlavorTestCase):
+    def test_CHStateSelect(self):
+        f = CHStateSelect()
+        out = u'''<select name="state">
+<option value="AG" selected="selected">Aargau</option>
+<option value="AI">Appenzell Innerrhoden</option>
+<option value="AR">Appenzell Ausserrhoden</option>
+<option value="BS">Basel-Stadt</option>
+<option value="BL">Basel-Land</option>
+<option value="BE">Berne</option>
+<option value="FR">Fribourg</option>
+<option value="GE">Geneva</option>
+<option value="GL">Glarus</option>
+<option value="GR">Graubuenden</option>
+<option value="JU">Jura</option>
+<option value="LU">Lucerne</option>
+<option value="NE">Neuchatel</option>
+<option value="NW">Nidwalden</option>
+<option value="OW">Obwalden</option>
+<option value="SH">Schaffhausen</option>
+<option value="SZ">Schwyz</option>
+<option value="SO">Solothurn</option>
+<option value="SG">St. Gallen</option>
+<option value="TG">Thurgau</option>
+<option value="TI">Ticino</option>
+<option value="UR">Uri</option>
+<option value="VS">Valais</option>
+<option value="VD">Vaud</option>
+<option value="ZG">Zug</option>
+<option value="ZH">Zurich</option>
+</select>'''
+        self.assertEqual(f.render('state', 'AG'), out)
+    
+    def test_CHZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXX.']
+        valid = {
+            '1234': '1234',
+            '0000': '0000',
+        }
+        invalid = {
+            '800x': error_format,
+            '80 00': error_format,
+        }
+        self.assertFieldOutput(CHZipCodeField, valid, invalid)
+    
+    def test_CHPhoneNumberField(self):
+        error_format = [u'Phone numbers must be in 0XX XXX XX XX format.']
+        valid = {
+            '012 345 67 89': '012 345 67 89',
+            '0123456789': '012 345 67 89',
+        }
+        invalid = {
+            '01234567890': error_format,
+            '1234567890': error_format,
+        }
+        self.assertFieldOutput(CHPhoneNumberField, valid, invalid)
+    
+    def test_CHIdentityCardNumberField(self):
+        error_format = [u'Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.']
+        valid = {
+            'C1234567<0': 'C1234567<0',
+            '2123456700': '2123456700',
+        }
+        invalid = {
+            'C1234567<1': error_format,
+            '2123456701': error_format,
+        }
+        self.assertFieldOutput(CHIdentityCardNumberField, valid, invalid)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/cl.py b/parts/django/tests/regressiontests/forms/localflavor/cl.py
new file mode 100644
index 0000000..15b8c7b
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/cl.py
@@ -0,0 +1,56 @@
+from django.contrib.localflavor.cl.forms import CLRutField, CLRegionSelect
+from django.core.exceptions import ValidationError
+
+from utils import LocalFlavorTestCase
+
+
+class CLLocalFlavorTests(LocalFlavorTestCase):
+    def test_CLRegionSelect(self):
+        f = CLRegionSelect()
+        out = u'''<select name="foo">
+<option value="RM">Regi\xf3n Metropolitana de Santiago</option>
+<option value="I">Regi\xf3n de Tarapac\xe1</option>
+<option value="II">Regi\xf3n de Antofagasta</option>
+<option value="III">Regi\xf3n de Atacama</option>
+<option value="IV">Regi\xf3n de Coquimbo</option>
+<option value="V">Regi\xf3n de Valpara\xedso</option>
+<option value="VI">Regi\xf3n del Libertador Bernardo O&#39;Higgins</option>
+<option value="VII">Regi\xf3n del Maule</option>
+<option value="VIII">Regi\xf3n del B\xedo B\xedo</option>
+<option value="IX">Regi\xf3n de la Araucan\xeda</option>
+<option value="X">Regi\xf3n de los Lagos</option>
+<option value="XI">Regi\xf3n de Ays\xe9n del General Carlos Ib\xe1\xf1ez del Campo</option>
+<option value="XII">Regi\xf3n de Magallanes y la Ant\xe1rtica Chilena</option>
+<option value="XIV">Regi\xf3n de Los R\xedos</option>
+<option value="XV">Regi\xf3n de Arica-Parinacota</option>
+</select>'''
+        self.assertEqual(f.render('foo', 'bar'), out)
+
+    def test_CLRutField(self):
+        error_invalid =  [u'The Chilean RUT is not valid.']
+        error_format = [u'Enter a valid Chilean RUT. The format is XX.XXX.XXX-X.']
+        valid = {
+            '11-6': '11-6',
+            '116': '11-6',
+            '767484100': '76.748.410-0',
+            '78.412.790-7': '78.412.790-7',
+            '8.334.6043': '8.334.604-3',
+            '76793310-K': '76.793.310-K',
+        }
+        invalid = {
+            '11.111.111-0': error_invalid,
+            '111': error_invalid,
+        }
+        self.assertFieldOutput(CLRutField, valid, invalid)
+
+        # deal with special "Strict Mode".
+        invalid = {
+            '11-6': error_format,
+            '767484100': error_format,
+            '8.334.6043': error_format,
+            '76793310-K': error_format,
+            '11.111.111-0': error_invalid
+        }
+        self.assertFieldOutput(CLRutField,
+            {}, invalid, field_kwargs={"strict": True}
+        )
diff --git a/parts/django/tests/regressiontests/forms/localflavor/cz.py b/parts/django/tests/regressiontests/forms/localflavor/cz.py
new file mode 100644
index 0000000..4cff172
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/cz.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+# Tests for the contrib/localflavor/ CZ Form Fields
+
+tests = r"""
+# CZPostalCodeField #########################################################
+
+>>> from django.contrib.localflavor.cz.forms import CZPostalCodeField
+>>> f = CZPostalCodeField()
+>>> f.clean('84545x')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX or XXX XX.']
+>>> f.clean('91909')
+u'91909'
+>>> f.clean('917 01')
+u'91701'
+>>> f.clean('12345')
+u'12345'
+>>> f.clean('123456')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX or XXX XX.']
+>>> f.clean('1234')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX or XXX XX.']
+>>> f.clean('123 4')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX or XXX XX.']
+
+# CZRegionSelect ############################################################
+
+>>> from django.contrib.localflavor.cz.forms import CZRegionSelect
+>>> w = CZRegionSelect()
+>>> w.render('regions', 'TT')
+u'<select name="regions">\n<option value="PR">Prague</option>\n<option value="CE">Central Bohemian Region</option>\n<option value="SO">South Bohemian Region</option>\n<option value="PI">Pilsen Region</option>\n<option value="CA">Carlsbad Region</option>\n<option value="US">Usti Region</option>\n<option value="LB">Liberec Region</option>\n<option value="HK">Hradec Region</option>\n<option value="PA">Pardubice Region</option>\n<option value="VY">Vysocina Region</option>\n<option value="SM">South Moravian Region</option>\n<option value="OL">Olomouc Region</option>\n<option value="ZL">Zlin Region</option>\n<option value="MS">Moravian-Silesian Region</option>\n</select>'
+
+# CZBirthNumberField ########################################################
+
+>>> from django.contrib.localflavor.cz.forms import CZBirthNumberField
+>>> f = CZBirthNumberField()
+>>> f.clean('880523/1237')
+u'880523/1237'
+>>> f.clean('8805231237')
+u'8805231237'
+>>> f.clean('880523/000')
+u'880523/000'
+>>> f.clean('880523000')
+u'880523000'
+>>> f.clean('882101/0011')
+u'882101/0011'
+>>> f.clean('880523/1237', 'm')
+u'880523/1237'
+>>> f.clean('885523/1231', 'f')
+u'885523/1231'
+>>> f.clean('123456/12')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX.']
+>>> f.clean('123456/12345')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX.']
+>>> f.clean('12345612')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX.']
+>>> f.clean('12345612345')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX.']
+>>> f.clean('881523/0000', 'm')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid birth number.']
+>>> f.clean('885223/0000', 'm')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid birth number.']
+>>> f.clean('881223/0000', 'f')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid birth number.']
+>>> f.clean('886523/0000', 'f')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid birth number.']
+>>> f.clean('880523/1239')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid birth number.']
+>>> f.clean('8805231239')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid birth number.']
+>>> f.clean('990101/0011')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid birth number.']
+
+# CZICNumberField ########################################################
+
+>>> from django.contrib.localflavor.cz.forms import CZICNumberField
+>>> f = CZICNumberField()
+>>> f.clean('12345679')
+u'12345679'
+>>> f.clean('12345601')
+u'12345601'
+>>> f.clean('12345661')
+u'12345661'
+>>> f.clean('12345610')
+u'12345610'
+>>> f.clean('1234567')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IC number.']
+>>> f.clean('12345660')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IC number.']
+>>> f.clean('12345600')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid IC number.']
+"""
diff --git a/parts/django/tests/regressiontests/forms/localflavor/de.py b/parts/django/tests/regressiontests/forms/localflavor/de.py
new file mode 100644
index 0000000..7c68bcc
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/de.py
@@ -0,0 +1,49 @@
+from django.contrib.localflavor.de.forms import (DEZipCodeField, DEStateSelect,
+    DEIdentityCardNumberField)
+
+from utils import LocalFlavorTestCase
+
+
+class DELocalFlavorTests(LocalFlavorTestCase):
+    def test_DEStateSelect(self):
+        f = DEStateSelect()
+        out = u'''<select name="states">
+<option value="BW">Baden-Wuerttemberg</option>
+<option value="BY">Bavaria</option>
+<option value="BE">Berlin</option>
+<option value="BB">Brandenburg</option>
+<option value="HB">Bremen</option>
+<option value="HH">Hamburg</option>
+<option value="HE">Hessen</option>
+<option value="MV">Mecklenburg-Western Pomerania</option>
+<option value="NI">Lower Saxony</option>
+<option value="NW">North Rhine-Westphalia</option>
+<option value="RP">Rhineland-Palatinate</option>
+<option value="SL">Saarland</option>
+<option value="SN">Saxony</option>
+<option value="ST">Saxony-Anhalt</option>
+<option value="SH">Schleswig-Holstein</option>
+<option value="TH" selected="selected">Thuringia</option>
+</select>'''
+        self.assertEqual(f.render('states', 'TH'), out)
+
+    def test_DEZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXXX.']
+        valid = {
+            '99423': '99423',
+        }
+        invalid = {
+            ' 99423': error_format,
+        }
+        self.assertFieldOutput(DEZipCodeField, valid, invalid)
+
+    def test_DEIdentityCardNumberField(self):
+        error_format = [u'Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.']
+        valid = {
+            '7549313035D-6004103-0903042-0': '7549313035D-6004103-0903042-0',
+            '9786324830D 6104243 0910271 2': '9786324830D-6104243-0910271-2',
+        }
+        invalid = {
+            '0434657485D-6407276-0508137-9': error_format,
+        }
+        self.assertFieldOutput(DEIdentityCardNumberField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/es.py b/parts/django/tests/regressiontests/forms/localflavor/es.py
new file mode 100644
index 0000000..b584075
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/es.py
@@ -0,0 +1,172 @@
+from django.contrib.localflavor.es.forms import (ESPostalCodeField, ESPhoneNumberField,
+    ESIdentityCardNumberField, ESCCCField, ESRegionSelect, ESProvinceSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class ESLocalFlavorTests(LocalFlavorTestCase):
+    def test_ESRegionSelect(self):
+        f = ESRegionSelect()
+        out = u'''<select name="regions">
+<option value="AN">Andalusia</option>
+<option value="AR">Aragon</option>
+<option value="O">Principality of Asturias</option>
+<option value="IB">Balearic Islands</option>
+<option value="PV">Basque Country</option>
+<option value="CN">Canary Islands</option>
+<option value="S">Cantabria</option>
+<option value="CM">Castile-La Mancha</option>
+<option value="CL">Castile and Leon</option>
+<option value="CT" selected="selected">Catalonia</option>
+<option value="EX">Extremadura</option>
+<option value="GA">Galicia</option>
+<option value="LO">La Rioja</option>
+<option value="M">Madrid</option>
+<option value="MU">Region of Murcia</option>
+<option value="NA">Foral Community of Navarre</option>
+<option value="VC">Valencian Community</option>
+</select>'''
+        self.assertEqual(f.render('regions', 'CT'), out)
+
+    def test_ESProvinceSelect(self):
+        f = ESProvinceSelect()
+        out = u'''<select name="provinces">
+<option value="01">Arava</option>
+<option value="02">Albacete</option>
+<option value="03">Alacant</option>
+<option value="04">Almeria</option>
+<option value="05">Avila</option>
+<option value="06">Badajoz</option>
+<option value="07">Illes Balears</option>
+<option value="08" selected="selected">Barcelona</option>
+<option value="09">Burgos</option>
+<option value="10">Caceres</option>
+<option value="11">Cadiz</option>
+<option value="12">Castello</option>
+<option value="13">Ciudad Real</option>
+<option value="14">Cordoba</option>
+<option value="15">A Coruna</option>
+<option value="16">Cuenca</option>
+<option value="17">Girona</option>
+<option value="18">Granada</option>
+<option value="19">Guadalajara</option>
+<option value="20">Guipuzkoa</option>
+<option value="21">Huelva</option>
+<option value="22">Huesca</option>
+<option value="23">Jaen</option>
+<option value="24">Leon</option>
+<option value="25">Lleida</option>
+<option value="26">La Rioja</option>
+<option value="27">Lugo</option>
+<option value="28">Madrid</option>
+<option value="29">Malaga</option>
+<option value="30">Murcia</option>
+<option value="31">Navarre</option>
+<option value="32">Ourense</option>
+<option value="33">Asturias</option>
+<option value="34">Palencia</option>
+<option value="35">Las Palmas</option>
+<option value="36">Pontevedra</option>
+<option value="37">Salamanca</option>
+<option value="38">Santa Cruz de Tenerife</option>
+<option value="39">Cantabria</option>
+<option value="40">Segovia</option>
+<option value="41">Seville</option>
+<option value="42">Soria</option>
+<option value="43">Tarragona</option>
+<option value="44">Teruel</option>
+<option value="45">Toledo</option>
+<option value="46">Valencia</option>
+<option value="47">Valladolid</option>
+<option value="48">Bizkaia</option>
+<option value="49">Zamora</option>
+<option value="50">Zaragoza</option>
+<option value="51">Ceuta</option>
+<option value="52">Melilla</option>
+</select>'''
+        self.assertEqual(f.render('provinces', '08'), out)
+
+    def test_ESPostalCodeField(self):
+        error_invalid = [u'Enter a valid postal code in the range and format 01XXX - 52XXX.']
+        valid = {
+            '08028': '08028',
+            '28080': '28080',
+        }
+        invalid = {
+            '53001': error_invalid,
+            '0801': error_invalid,
+            '080001': error_invalid,
+            '00999': error_invalid,
+            '08 01': error_invalid,
+            '08A01': error_invalid,
+        }
+        self.assertFieldOutput(ESPostalCodeField, valid, invalid)
+
+    def test_ESPhoneNumberField(self):
+        error_invalid = [u'Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX.']
+        valid = {
+            '650010101': '650010101',
+            '931234567': '931234567',
+            '800123123': '800123123',
+        }
+        invalid = {
+            '555555555': error_invalid,
+            '789789789': error_invalid,
+            '99123123': error_invalid,
+            '9999123123': error_invalid,
+        }
+        self.assertFieldOutput(ESPhoneNumberField, valid, invalid)
+
+    def test_ESIdentityCardNumberField(self):
+        error_invalid = [u'Please enter a valid NIF, NIE, or CIF.']
+        error_checksum_nif = [u'Invalid checksum for NIF.']
+        error_checksum_nie = [u'Invalid checksum for NIE.']
+        error_checksum_cif = [u'Invalid checksum for CIF.']
+        valid = {
+            '78699688J': '78699688J',
+            '78699688-J': '78699688J',
+            '78699688 J': '78699688J',
+            '78699688 j': '78699688J',
+            'X0901797J': 'X0901797J',
+            'X-6124387-Q': 'X6124387Q',
+            'X 0012953 G': 'X0012953G',
+            'x-3287690-r': 'X3287690R',
+            't-03287690r': 'T03287690R',
+            'P2907500I': 'P2907500I',
+            'B38790911': 'B38790911',
+            'B31234560': 'B31234560',
+            'B-3879091A': 'B3879091A',
+            'B 38790911': 'B38790911',
+            'P-3900800-H': 'P3900800H',
+            'P 39008008': 'P39008008',
+            'C-28795565': 'C28795565',
+            'C 2879556E': 'C2879556E',
+        }
+        invalid = {
+            '78699688T': error_checksum_nif,
+            'X-03287690': error_invalid,
+            'X-03287690-T': error_checksum_nie,
+            'B 38790917': error_checksum_cif,
+            'C28795567': error_checksum_cif,
+            'I38790911': error_invalid,
+            '78699688-2': error_invalid,
+        }
+        self.assertFieldOutput(ESIdentityCardNumberField, valid, invalid)
+    
+    def test_ESCCCField(self):
+        error_invalid = [u'Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX.']
+        error_checksum = [u'Invalid checksum for bank account number.']
+        valid = {
+            '20770338793100254321': '20770338793100254321',
+            '2077 0338 79 3100254321': '2077 0338 79 3100254321',
+            '2077-0338-79-3100254321': '2077-0338-79-3100254321',
+        }
+        invalid = {
+            '2077.0338.79.3100254321': error_invalid,
+            '2077-0338-78-3100254321': error_checksum,
+            '2077-0338-89-3100254321': error_checksum,
+            '2077-03-3879-3100254321': error_invalid,
+        }
+        self.assertFieldOutput(ESCCCField, valid, invalid)
+
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/fi.py b/parts/django/tests/regressiontests/forms/localflavor/fi.py
new file mode 100644
index 0000000..161eb17
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/fi.py
@@ -0,0 +1,382 @@
+from django.contrib.localflavor.fi.forms import (FIZipCodeField,
+    FISocialSecurityNumber, FIMunicipalitySelect)
+
+from utils import LocalFlavorTestCase
+
+
+class FILocalFlavorTests(LocalFlavorTestCase):
+    def test_FIMunicipalitySelect(self):
+        f = FIMunicipalitySelect()
+        out = u'''<select name="municipalities">
+<option value="akaa">Akaa</option>
+<option value="alajarvi">Alaj\xe4rvi</option>
+<option value="alavieska">Alavieska</option>
+<option value="alavus">Alavus</option>
+<option value="artjarvi">Artj\xe4rvi</option>
+<option value="asikkala">Asikkala</option>
+<option value="askola">Askola</option>
+<option value="aura">Aura</option>
+<option value="brando">Br\xe4nd\xf6</option>
+<option value="eckero">Ecker\xf6</option>
+<option value="enonkoski">Enonkoski</option>
+<option value="enontekio">Enonteki\xf6</option>
+<option value="espoo">Espoo</option>
+<option value="eura">Eura</option>
+<option value="eurajoki">Eurajoki</option>
+<option value="evijarvi">Evij\xe4rvi</option>
+<option value="finstrom">Finstr\xf6m</option>
+<option value="forssa">Forssa</option>
+<option value="foglo">F\xf6gl\xf6</option>
+<option value="geta">Geta</option>
+<option value="haapajarvi">Haapaj\xe4rvi</option>
+<option value="haapavesi">Haapavesi</option>
+<option value="hailuoto">Hailuoto</option>
+<option value="halsua">Halsua</option>
+<option value="hamina">Hamina</option>
+<option value="hammarland">Hammarland</option>
+<option value="hankasalmi">Hankasalmi</option>
+<option value="hanko">Hanko</option>
+<option value="harjavalta">Harjavalta</option>
+<option value="hartola">Hartola</option>
+<option value="hattula">Hattula</option>
+<option value="haukipudas">Haukipudas</option>
+<option value="hausjarvi">Hausj\xe4rvi</option>
+<option value="heinola">Heinola</option>
+<option value="heinavesi">Hein\xe4vesi</option>
+<option value="helsinki">Helsinki</option>
+<option value="hirvensalmi">Hirvensalmi</option>
+<option value="hollola">Hollola</option>
+<option value="honkajoki">Honkajoki</option>
+<option value="huittinen">Huittinen</option>
+<option value="humppila">Humppila</option>
+<option value="hyrynsalmi">Hyrynsalmi</option>
+<option value="hyvinkaa">Hyvink\xe4\xe4</option>
+<option value="hameenkoski">H\xe4meenkoski</option>
+<option value="hameenkyro">H\xe4meenkyr\xf6</option>
+<option value="hameenlinna">H\xe4meenlinna</option>
+<option value="ii">Ii</option>
+<option value="iisalmi">Iisalmi</option>
+<option value="iitti">Iitti</option>
+<option value="ikaalinen">Ikaalinen</option>
+<option value="ilmajoki">Ilmajoki</option>
+<option value="ilomantsi">Ilomantsi</option>
+<option value="imatra">Imatra</option>
+<option value="inari">Inari</option>
+<option value="inkoo">Inkoo</option>
+<option value="isojoki">Isojoki</option>
+<option value="isokyro">Isokyr\xf6</option>
+<option value="jalasjarvi">Jalasj\xe4rvi</option>
+<option value="janakkala">Janakkala</option>
+<option value="joensuu">Joensuu</option>
+<option value="jokioinen">Jokioinen</option>
+<option value="jomala">Jomala</option>
+<option value="joroinen">Joroinen</option>
+<option value="joutsa">Joutsa</option>
+<option value="juankoski">Juankoski</option>
+<option value="juuka">Juuka</option>
+<option value="juupajoki">Juupajoki</option>
+<option value="juva">Juva</option>
+<option value="jyvaskyla">Jyv\xe4skyl\xe4</option>
+<option value="jamijarvi">J\xe4mij\xe4rvi</option>
+<option value="jamsa">J\xe4ms\xe4</option>
+<option value="jarvenpaa">J\xe4rvenp\xe4\xe4</option>
+<option value="kaarina">Kaarina</option>
+<option value="kaavi">Kaavi</option>
+<option value="kajaani">Kajaani</option>
+<option value="kalajoki">Kalajoki</option>
+<option value="kangasala">Kangasala</option>
+<option value="kangasniemi">Kangasniemi</option>
+<option value="kankaanpaa">Kankaanp\xe4\xe4</option>
+<option value="kannonkoski">Kannonkoski</option>
+<option value="kannus">Kannus</option>
+<option value="karijoki">Karijoki</option>
+<option value="karjalohja">Karjalohja</option>
+<option value="karkkila">Karkkila</option>
+<option value="karstula">Karstula</option>
+<option value="karttula">Karttula</option>
+<option value="karvia">Karvia</option>
+<option value="kaskinen">Kaskinen</option>
+<option value="kauhajoki">Kauhajoki</option>
+<option value="kauhava">Kauhava</option>
+<option value="kauniainen">Kauniainen</option>
+<option value="kaustinen">Kaustinen</option>
+<option value="keitele">Keitele</option>
+<option value="kemi">Kemi</option>
+<option value="kemijarvi">Kemij\xe4rvi</option>
+<option value="keminmaa">Keminmaa</option>
+<option value="kemionsaari">Kemi\xf6nsaari</option>
+<option value="kempele">Kempele</option>
+<option value="kerava">Kerava</option>
+<option value="kerimaki">Kerim\xe4ki</option>
+<option value="kesalahti">Kes\xe4lahti</option>
+<option value="keuruu">Keuruu</option>
+<option value="kihnio">Kihni\xf6</option>
+<option value="kiikoinen">Kiikoinen</option>
+<option value="kiiminki">Kiiminki</option>
+<option value="kinnula">Kinnula</option>
+<option value="kirkkonummi">Kirkkonummi</option>
+<option value="kitee">Kitee</option>
+<option value="kittila">Kittil\xe4</option>
+<option value="kiuruvesi">Kiuruvesi</option>
+<option value="kivijarvi">Kivij\xe4rvi</option>
+<option value="kokemaki">Kokem\xe4ki</option>
+<option value="kokkola">Kokkola</option>
+<option value="kolari">Kolari</option>
+<option value="konnevesi">Konnevesi</option>
+<option value="kontiolahti">Kontiolahti</option>
+<option value="korsnas">Korsn\xe4s</option>
+<option value="koskitl">Koski Tl</option>
+<option value="kotka">Kotka</option>
+<option value="kouvola">Kouvola</option>
+<option value="kristiinankaupunki">Kristiinankaupunki</option>
+<option value="kruunupyy">Kruunupyy</option>
+<option value="kuhmalahti">Kuhmalahti</option>
+<option value="kuhmo">Kuhmo</option>
+<option value="kuhmoinen">Kuhmoinen</option>
+<option value="kumlinge">Kumlinge</option>
+<option value="kuopio">Kuopio</option>
+<option value="kuortane">Kuortane</option>
+<option value="kurikka">Kurikka</option>
+<option value="kustavi">Kustavi</option>
+<option value="kuusamo">Kuusamo</option>
+<option value="kylmakoski">Kylm\xe4koski</option>
+<option value="kyyjarvi">Kyyj\xe4rvi</option>
+<option value="karkola">K\xe4rk\xf6l\xe4</option>
+<option value="karsamaki">K\xe4rs\xe4m\xe4ki</option>
+<option value="kokar">K\xf6kar</option>
+<option value="koylio">K\xf6yli\xf6</option>
+<option value="lahti">Lahti</option>
+<option value="laihia">Laihia</option>
+<option value="laitila">Laitila</option>
+<option value="lapinjarvi">Lapinj\xe4rvi</option>
+<option value="lapinlahti">Lapinlahti</option>
+<option value="lappajarvi">Lappaj\xe4rvi</option>
+<option value="lappeenranta">Lappeenranta</option>
+<option value="lapua">Lapua</option>
+<option value="laukaa">Laukaa</option>
+<option value="lavia">Lavia</option>
+<option value="lemi">Lemi</option>
+<option value="lemland">Lemland</option>
+<option value="lempaala">Lemp\xe4\xe4l\xe4</option>
+<option value="leppavirta">Lepp\xe4virta</option>
+<option value="lestijarvi">Lestij\xe4rvi</option>
+<option value="lieksa">Lieksa</option>
+<option value="lieto">Lieto</option>
+<option value="liminka">Liminka</option>
+<option value="liperi">Liperi</option>
+<option value="lohja">Lohja</option>
+<option value="loimaa">Loimaa</option>
+<option value="loppi">Loppi</option>
+<option value="loviisa">Loviisa</option>
+<option value="luhanka">Luhanka</option>
+<option value="lumijoki">Lumijoki</option>
+<option value="lumparland">Lumparland</option>
+<option value="luoto">Luoto</option>
+<option value="luumaki">Luum\xe4ki</option>
+<option value="luvia">Luvia</option>
+<option value="lansi-turunmaa">L\xe4nsi-Turunmaa</option>
+<option value="maalahti">Maalahti</option>
+<option value="maaninka">Maaninka</option>
+<option value="maarianhamina">Maarianhamina</option>
+<option value="marttila">Marttila</option>
+<option value="masku">Masku</option>
+<option value="merijarvi">Merij\xe4rvi</option>
+<option value="merikarvia">Merikarvia</option>
+<option value="miehikkala">Miehikk\xe4l\xe4</option>
+<option value="mikkeli">Mikkeli</option>
+<option value="muhos">Muhos</option>
+<option value="multia">Multia</option>
+<option value="muonio">Muonio</option>
+<option value="mustasaari">Mustasaari</option>
+<option value="muurame">Muurame</option>
+<option value="mynamaki">Myn\xe4m\xe4ki</option>
+<option value="myrskyla">Myrskyl\xe4</option>
+<option value="mantsala">M\xe4nts\xe4l\xe4</option>
+<option value="mantta-vilppula">M\xe4ntt\xe4-Vilppula</option>
+<option value="mantyharju">M\xe4ntyharju</option>
+<option value="naantali">Naantali</option>
+<option value="nakkila">Nakkila</option>
+<option value="nastola">Nastola</option>
+<option value="nilsia">Nilsi\xe4</option>
+<option value="nivala">Nivala</option>
+<option value="nokia">Nokia</option>
+<option value="nousiainen">Nousiainen</option>
+<option value="nummi-pusula">Nummi-Pusula</option>
+<option value="nurmes">Nurmes</option>
+<option value="nurmijarvi">Nurmij\xe4rvi</option>
+<option value="narpio">N\xe4rpi\xf6</option>
+<option value="oravainen">Oravainen</option>
+<option value="orimattila">Orimattila</option>
+<option value="oripaa">Orip\xe4\xe4</option>
+<option value="orivesi">Orivesi</option>
+<option value="oulainen">Oulainen</option>
+<option value="oulu">Oulu</option>
+<option value="oulunsalo">Oulunsalo</option>
+<option value="outokumpu">Outokumpu</option>
+<option value="padasjoki">Padasjoki</option>
+<option value="paimio">Paimio</option>
+<option value="paltamo">Paltamo</option>
+<option value="parikkala">Parikkala</option>
+<option value="parkano">Parkano</option>
+<option value="pedersore">Peders\xf6re</option>
+<option value="pelkosenniemi">Pelkosenniemi</option>
+<option value="pello">Pello</option>
+<option value="perho">Perho</option>
+<option value="pertunmaa">Pertunmaa</option>
+<option value="petajavesi">Pet\xe4j\xe4vesi</option>
+<option value="pieksamaki">Pieks\xe4m\xe4ki</option>
+<option value="pielavesi">Pielavesi</option>
+<option value="pietarsaari">Pietarsaari</option>
+<option value="pihtipudas">Pihtipudas</option>
+<option value="pirkkala">Pirkkala</option>
+<option value="polvijarvi">Polvij\xe4rvi</option>
+<option value="pomarkku">Pomarkku</option>
+<option value="pori">Pori</option>
+<option value="pornainen">Pornainen</option>
+<option value="porvoo">Porvoo</option>
+<option value="posio">Posio</option>
+<option value="pudasjarvi">Pudasj\xe4rvi</option>
+<option value="pukkila">Pukkila</option>
+<option value="punkaharju">Punkaharju</option>
+<option value="punkalaidun">Punkalaidun</option>
+<option value="puolanka">Puolanka</option>
+<option value="puumala">Puumala</option>
+<option value="pyhtaa">Pyht\xe4\xe4</option>
+<option value="pyhajoki">Pyh\xe4joki</option>
+<option value="pyhajarvi">Pyh\xe4j\xe4rvi</option>
+<option value="pyhanta">Pyh\xe4nt\xe4</option>
+<option value="pyharanta">Pyh\xe4ranta</option>
+<option value="palkane">P\xe4lk\xe4ne</option>
+<option value="poytya">P\xf6yty\xe4</option>
+<option value="raahe">Raahe</option>
+<option value="raasepori">Raasepori</option>
+<option value="raisio">Raisio</option>
+<option value="rantasalmi">Rantasalmi</option>
+<option value="ranua">Ranua</option>
+<option value="rauma">Rauma</option>
+<option value="rautalampi">Rautalampi</option>
+<option value="rautavaara">Rautavaara</option>
+<option value="rautjarvi">Rautj\xe4rvi</option>
+<option value="reisjarvi">Reisj\xe4rvi</option>
+<option value="riihimaki">Riihim\xe4ki</option>
+<option value="ristiina">Ristiina</option>
+<option value="ristijarvi">Ristij\xe4rvi</option>
+<option value="rovaniemi">Rovaniemi</option>
+<option value="ruokolahti">Ruokolahti</option>
+<option value="ruovesi">Ruovesi</option>
+<option value="rusko">Rusko</option>
+<option value="raakkyla">R\xe4\xe4kkyl\xe4</option>
+<option value="saarijarvi">Saarij\xe4rvi</option>
+<option value="salla">Salla</option>
+<option value="salo">Salo</option>
+<option value="saltvik">Saltvik</option>
+<option value="sastamala">Sastamala</option>
+<option value="sauvo">Sauvo</option>
+<option value="savitaipale">Savitaipale</option>
+<option value="savonlinna">Savonlinna</option>
+<option value="savukoski">Savukoski</option>
+<option value="seinajoki">Sein\xe4joki</option>
+<option value="sievi">Sievi</option>
+<option value="siikainen">Siikainen</option>
+<option value="siikajoki">Siikajoki</option>
+<option value="siikalatva">Siikalatva</option>
+<option value="siilinjarvi">Siilinj\xe4rvi</option>
+<option value="simo">Simo</option>
+<option value="sipoo">Sipoo</option>
+<option value="siuntio">Siuntio</option>
+<option value="sodankyla">Sodankyl\xe4</option>
+<option value="soini">Soini</option>
+<option value="somero">Somero</option>
+<option value="sonkajarvi">Sonkaj\xe4rvi</option>
+<option value="sotkamo">Sotkamo</option>
+<option value="sottunga">Sottunga</option>
+<option value="sulkava">Sulkava</option>
+<option value="sund">Sund</option>
+<option value="suomenniemi">Suomenniemi</option>
+<option value="suomussalmi">Suomussalmi</option>
+<option value="suonenjoki">Suonenjoki</option>
+<option value="sysma">Sysm\xe4</option>
+<option value="sakyla">S\xe4kyl\xe4</option>
+<option value="taipalsaari">Taipalsaari</option>
+<option value="taivalkoski">Taivalkoski</option>
+<option value="taivassalo">Taivassalo</option>
+<option value="tammela">Tammela</option>
+<option value="tampere">Tampere</option>
+<option value="tarvasjoki">Tarvasjoki</option>
+<option value="tervo">Tervo</option>
+<option value="tervola">Tervola</option>
+<option value="teuva">Teuva</option>
+<option value="tohmajarvi">Tohmaj\xe4rvi</option>
+<option value="toholampi">Toholampi</option>
+<option value="toivakka">Toivakka</option>
+<option value="tornio">Tornio</option>
+<option value="turku" selected="selected">Turku</option>
+<option value="tuusniemi">Tuusniemi</option>
+<option value="tuusula">Tuusula</option>
+<option value="tyrnava">Tyrn\xe4v\xe4</option>
+<option value="toysa">T\xf6ys\xe4</option>
+<option value="ulvila">Ulvila</option>
+<option value="urjala">Urjala</option>
+<option value="utajarvi">Utaj\xe4rvi</option>
+<option value="utsjoki">Utsjoki</option>
+<option value="uurainen">Uurainen</option>
+<option value="uusikaarlepyy">Uusikaarlepyy</option>
+<option value="uusikaupunki">Uusikaupunki</option>
+<option value="vaala">Vaala</option>
+<option value="vaasa">Vaasa</option>
+<option value="valkeakoski">Valkeakoski</option>
+<option value="valtimo">Valtimo</option>
+<option value="vantaa">Vantaa</option>
+<option value="varkaus">Varkaus</option>
+<option value="varpaisjarvi">Varpaisj\xe4rvi</option>
+<option value="vehmaa">Vehmaa</option>
+<option value="vesanto">Vesanto</option>
+<option value="vesilahti">Vesilahti</option>
+<option value="veteli">Veteli</option>
+<option value="vierema">Vierem\xe4</option>
+<option value="vihanti">Vihanti</option>
+<option value="vihti">Vihti</option>
+<option value="viitasaari">Viitasaari</option>
+<option value="vimpeli">Vimpeli</option>
+<option value="virolahti">Virolahti</option>
+<option value="virrat">Virrat</option>
+<option value="vardo">V\xe5rd\xf6</option>
+<option value="vahakyro">V\xe4h\xe4kyr\xf6</option>
+<option value="voyri-maksamaa">V\xf6yri-Maksamaa</option>
+<option value="yli-ii">Yli-Ii</option>
+<option value="ylitornio">Ylitornio</option>
+<option value="ylivieska">Ylivieska</option>
+<option value="ylojarvi">Yl\xf6j\xe4rvi</option>
+<option value="ypaja">Yp\xe4j\xe4</option>
+<option value="ahtari">\xc4ht\xe4ri</option>
+<option value="aanekoski">\xc4\xe4nekoski</option>
+</select>'''
+        self.assertEquals(f.render('municipalities', 'turku'), out)
+
+    def test_FIZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXXX.']
+        valid = {
+            '20540': '20540',
+            '20101': '20101',
+        }
+        invalid = {
+            '20s40': error_format,
+            '205401': error_format
+        }
+        self.assertFieldOutput(FIZipCodeField, valid, invalid)
+
+    def test_FISocialSecurityNumber(self):
+        error_invalid = [u'Enter a valid Finnish social security number.']
+        valid = {
+            '010101-0101': '010101-0101',
+            '010101+0101': '010101+0101',
+            '010101A0101': '010101A0101',
+        }
+        invalid = {
+            '101010-0102': error_invalid,
+            '10a010-0101': error_invalid,
+            '101010-0\xe401': error_invalid,
+            '101010b0101': error_invalid,
+        }
+        self.assertFieldOutput(FISocialSecurityNumber, valid, invalid)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/fr.py b/parts/django/tests/regressiontests/forms/localflavor/fr.py
new file mode 100644
index 0000000..96045c3
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/fr.py
@@ -0,0 +1,145 @@
+from django.contrib.localflavor.fr.forms import (FRZipCodeField,
+        FRPhoneNumberField, FRDepartmentSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class FRLocalFlavorTests(LocalFlavorTestCase):
+    def test_FRZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXXX.']
+        valid = {
+            '75001': '75001',
+            '93200': '93200',
+        }
+        invalid = {
+            '2A200': error_format,
+            '980001': error_format,
+        }
+        self.assertFieldOutput(FRZipCodeField, valid, invalid)
+
+    def test_FRPhoneNumberField(self):
+        error_format = [u'Phone numbers must be in 0X XX XX XX XX format.']
+        valid = {
+            '01 55 44 58 64': '01 55 44 58 64',
+            '0155445864': '01 55 44 58 64',
+            '01 5544 5864': '01 55 44 58 64',
+            '01 55.44.58.64': '01 55 44 58 64',
+            '01.55.44.58.64': '01 55 44 58 64',
+        }
+        invalid = {
+            '01,55,44,58,64': error_format,
+            '555 015 544': error_format,
+        }
+        self.assertFieldOutput(FRPhoneNumberField, valid, invalid)
+
+    def test_FRDepartmentSelect(self):
+        f = FRDepartmentSelect()
+        out = u'''<select name="dep">
+<option value="01">01 - Ain</option>
+<option value="02">02 - Aisne</option>
+<option value="03">03 - Allier</option>
+<option value="04">04 - Alpes-de-Haute-Provence</option>
+<option value="05">05 - Hautes-Alpes</option>
+<option value="06">06 - Alpes-Maritimes</option>
+<option value="07">07 - Ardeche</option>
+<option value="08">08 - Ardennes</option>
+<option value="09">09 - Ariege</option>
+<option value="10">10 - Aube</option>
+<option value="11">11 - Aude</option>
+<option value="12">12 - Aveyron</option>
+<option value="13">13 - Bouches-du-Rhone</option>
+<option value="14">14 - Calvados</option>
+<option value="15">15 - Cantal</option>
+<option value="16">16 - Charente</option>
+<option value="17">17 - Charente-Maritime</option>
+<option value="18">18 - Cher</option>
+<option value="19">19 - Correze</option>
+<option value="21">21 - Cote-d&#39;Or</option>
+<option value="22">22 - Cotes-d&#39;Armor</option>
+<option value="23">23 - Creuse</option>
+<option value="24">24 - Dordogne</option>
+<option value="25">25 - Doubs</option>
+<option value="26">26 - Drome</option>
+<option value="27">27 - Eure</option>
+<option value="28">28 - Eure-et-Loire</option>
+<option value="29">29 - Finistere</option>
+<option value="2A">2A - Corse-du-Sud</option>
+<option value="2B">2B - Haute-Corse</option>
+<option value="30">30 - Gard</option>
+<option value="31">31 - Haute-Garonne</option>
+<option value="32">32 - Gers</option>
+<option value="33">33 - Gironde</option>
+<option value="34">34 - Herault</option>
+<option value="35">35 - Ille-et-Vilaine</option>
+<option value="36">36 - Indre</option>
+<option value="37">37 - Indre-et-Loire</option>
+<option value="38">38 - Isere</option>
+<option value="39">39 - Jura</option>
+<option value="40">40 - Landes</option>
+<option value="41">41 - Loir-et-Cher</option>
+<option value="42">42 - Loire</option>
+<option value="43">43 - Haute-Loire</option>
+<option value="44">44 - Loire-Atlantique</option>
+<option value="45">45 - Loiret</option>
+<option value="46">46 - Lot</option>
+<option value="47">47 - Lot-et-Garonne</option>
+<option value="48">48 - Lozere</option>
+<option value="49">49 - Maine-et-Loire</option>
+<option value="50">50 - Manche</option>
+<option value="51">51 - Marne</option>
+<option value="52">52 - Haute-Marne</option>
+<option value="53">53 - Mayenne</option>
+<option value="54">54 - Meurthe-et-Moselle</option>
+<option value="55">55 - Meuse</option>
+<option value="56">56 - Morbihan</option>
+<option value="57">57 - Moselle</option>
+<option value="58">58 - Nievre</option>
+<option value="59">59 - Nord</option>
+<option value="60">60 - Oise</option>
+<option value="61">61 - Orne</option>
+<option value="62">62 - Pas-de-Calais</option>
+<option value="63">63 - Puy-de-Dome</option>
+<option value="64">64 - Pyrenees-Atlantiques</option>
+<option value="65">65 - Hautes-Pyrenees</option>
+<option value="66">66 - Pyrenees-Orientales</option>
+<option value="67">67 - Bas-Rhin</option>
+<option value="68">68 - Haut-Rhin</option>
+<option value="69">69 - Rhone</option>
+<option value="70">70 - Haute-Saone</option>
+<option value="71">71 - Saone-et-Loire</option>
+<option value="72">72 - Sarthe</option>
+<option value="73">73 - Savoie</option>
+<option value="74">74 - Haute-Savoie</option>
+<option value="75">75 - Paris</option>
+<option value="76">76 - Seine-Maritime</option>
+<option value="77">77 - Seine-et-Marne</option>
+<option value="78">78 - Yvelines</option>
+<option value="79">79 - Deux-Sevres</option>
+<option value="80">80 - Somme</option>
+<option value="81">81 - Tarn</option>
+<option value="82">82 - Tarn-et-Garonne</option>
+<option value="83">83 - Var</option>
+<option value="84">84 - Vaucluse</option>
+<option value="85">85 - Vendee</option>
+<option value="86">86 - Vienne</option>
+<option value="87">87 - Haute-Vienne</option>
+<option value="88">88 - Vosges</option>
+<option value="89">89 - Yonne</option>
+<option value="90">90 - Territoire de Belfort</option>
+<option value="91">91 - Essonne</option>
+<option value="92">92 - Hauts-de-Seine</option>
+<option value="93">93 - Seine-Saint-Denis</option>
+<option value="94">94 - Val-de-Marne</option>
+<option value="95">95 - Val-d&#39;Oise</option>
+<option value="971">971 - Guadeloupe</option>
+<option value="972">972 - Martinique</option>
+<option value="973">973 - Guyane</option>
+<option value="974">974 - La Reunion</option>
+<option value="975">975 - Saint-Pierre-et-Miquelon</option>
+<option value="976">976 - Mayotte</option>
+<option value="984">984 - Terres Australes et Antarctiques</option>
+<option value="986">986 - Wallis et Futuna</option>
+<option value="987">987 - Polynesie Francaise</option>
+<option value="988">988 - Nouvelle-Caledonie</option>
+</select>'''
+        self.assertEqual(f.render('dep', 'Paris'), out)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/generic.py b/parts/django/tests/regressiontests/forms/localflavor/generic.py
new file mode 100644
index 0000000..f47fc91
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/generic.py
@@ -0,0 +1,88 @@
+import datetime
+
+from django.contrib.localflavor.generic.forms import DateField, DateTimeField
+
+from utils import LocalFlavorTestCase
+
+
+class GenericLocalFlavorTests(LocalFlavorTestCase):
+    def test_GenericDateField(self):
+        error_invalid = [u'Enter a valid date.']
+        valid = {
+            datetime.date(2006, 10, 25): datetime.date(2006, 10, 25),
+            datetime.datetime(2006, 10, 25, 14, 30): datetime.date(2006, 10, 25),
+            datetime.datetime(2006, 10, 25, 14, 30, 59): datetime.date(2006, 10, 25),
+            datetime.datetime(2006, 10, 25, 14, 30, 59, 200): datetime.date(2006, 10, 25),
+            '2006-10-25': datetime.date(2006, 10, 25),
+            '25/10/2006': datetime.date(2006, 10, 25),
+            '25/10/06': datetime.date(2006, 10, 25),
+            'Oct 25 2006': datetime.date(2006, 10, 25),
+            'October 25 2006': datetime.date(2006, 10, 25),
+            'October 25, 2006': datetime.date(2006, 10, 25),
+            '25 October 2006': datetime.date(2006, 10, 25),
+            '25 October, 2006': datetime.date(2006, 10, 25),
+        }
+        invalid = {
+            '2006-4-31': error_invalid,
+            '200a-10-25': error_invalid,
+            '10/25/06': error_invalid,
+        }
+        self.assertFieldOutput(DateField, valid, invalid, empty_value=None)
+
+        # DateField with optional input_formats parameter
+        valid = {
+            datetime.date(2006, 10, 25): datetime.date(2006, 10, 25),
+            datetime.datetime(2006, 10, 25, 14, 30): datetime.date(2006, 10, 25),
+            '2006 10 25': datetime.date(2006, 10, 25),
+        }
+        invalid = {
+            '2006-10-25': error_invalid,
+            '25/10/2006': error_invalid,
+            '25/10/06': error_invalid,
+        }
+        kwargs = {'input_formats':['%Y %m %d'],}
+        self.assertFieldOutput(DateField,
+            valid, invalid, field_kwargs=kwargs, empty_value=None
+        )
+
+    def test_GenericDateTimeField(self):
+        error_invalid = [u'Enter a valid date/time.']
+        valid = {
+            datetime.date(2006, 10, 25): datetime.datetime(2006, 10, 25, 0, 0),
+            datetime.datetime(2006, 10, 25, 14, 30): datetime.datetime(2006, 10, 25, 14, 30),
+            datetime.datetime(2006, 10, 25, 14, 30, 59): datetime.datetime(2006, 10, 25, 14, 30, 59),
+            datetime.datetime(2006, 10, 25, 14, 30, 59, 200): datetime.datetime(2006, 10, 25, 14, 30, 59, 200),
+            '2006-10-25 14:30:45': datetime.datetime(2006, 10, 25, 14, 30, 45),
+            '2006-10-25 14:30:00': datetime.datetime(2006, 10, 25, 14, 30),
+            '2006-10-25 14:30': datetime.datetime(2006, 10, 25, 14, 30),
+            '2006-10-25': datetime.datetime(2006, 10, 25, 0, 0),
+            '25/10/2006 14:30:45': datetime.datetime(2006, 10, 25, 14, 30, 45),
+            '25/10/2006 14:30:00': datetime.datetime(2006, 10, 25, 14, 30),
+            '25/10/2006 14:30': datetime.datetime(2006, 10, 25, 14, 30),
+            '25/10/2006': datetime.datetime(2006, 10, 25, 0, 0),
+            '25/10/06 14:30:45': datetime.datetime(2006, 10, 25, 14, 30, 45),
+            '25/10/06 14:30:00': datetime.datetime(2006, 10, 25, 14, 30),
+            '25/10/06 14:30': datetime.datetime(2006, 10, 25, 14, 30),
+            '25/10/06': datetime.datetime(2006, 10, 25, 0, 0),
+        }
+        invalid = {
+            'hello': error_invalid,
+            '2006-10-25 4:30 p.m.': error_invalid,
+        }
+        self.assertFieldOutput(DateTimeField, valid, invalid, empty_value=None)
+
+        # DateTimeField with optional input_formats paramter
+        valid = {
+            datetime.date(2006, 10, 25): datetime.datetime(2006, 10, 25, 0, 0),
+            datetime.datetime(2006, 10, 25, 14, 30): datetime.datetime(2006, 10, 25, 14, 30),
+            datetime.datetime(2006, 10, 25, 14, 30, 59): datetime.datetime(2006, 10, 25, 14, 30, 59),
+            datetime.datetime(2006, 10, 25, 14, 30, 59, 200): datetime.datetime(2006, 10, 25, 14, 30, 59, 200),
+            '2006 10 25 2:30 PM': datetime.datetime(2006, 10, 25, 14, 30),
+        }
+        invalid = {
+            '2006-10-25 14:30:45': error_invalid,
+        }
+        kwargs = {'input_formats':['%Y %m %d %I:%M %p'],}
+        self.assertFieldOutput(DateTimeField,
+            valid, invalid, field_kwargs=kwargs, empty_value=None
+        )
diff --git a/parts/django/tests/regressiontests/forms/localflavor/id.py b/parts/django/tests/regressiontests/forms/localflavor/id.py
new file mode 100644
index 0000000..cb346ef
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/id.py
@@ -0,0 +1,181 @@
+from django.contrib.localflavor.id.forms import (IDPhoneNumberField,
+    IDPostCodeField, IDNationalIdentityNumberField, IDLicensePlateField,
+    IDProvinceSelect, IDLicensePlatePrefixSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class IDLocalFlavorTests(LocalFlavorTestCase):
+    def test_IDProvinceSelect(self):
+        f = IDProvinceSelect()
+        out = u'''<select name="provinces">
+<option value="BLI">Bali</option>
+<option value="BTN">Banten</option>
+<option value="BKL">Bengkulu</option>
+<option value="DIY">Yogyakarta</option>
+<option value="JKT">Jakarta</option>
+<option value="GOR">Gorontalo</option>
+<option value="JMB">Jambi</option>
+<option value="JBR">Jawa Barat</option>
+<option value="JTG">Jawa Tengah</option>
+<option value="JTM">Jawa Timur</option>
+<option value="KBR">Kalimantan Barat</option>
+<option value="KSL">Kalimantan Selatan</option>
+<option value="KTG">Kalimantan Tengah</option>
+<option value="KTM">Kalimantan Timur</option>
+<option value="BBL">Kepulauan Bangka-Belitung</option>
+<option value="KRI">Kepulauan Riau</option>
+<option value="LPG" selected="selected">Lampung</option>
+<option value="MLK">Maluku</option>
+<option value="MUT">Maluku Utara</option>
+<option value="NAD">Nanggroe Aceh Darussalam</option>
+<option value="NTB">Nusa Tenggara Barat</option>
+<option value="NTT">Nusa Tenggara Timur</option>
+<option value="PPA">Papua</option>
+<option value="PPB">Papua Barat</option>
+<option value="RIU">Riau</option>
+<option value="SLB">Sulawesi Barat</option>
+<option value="SLS">Sulawesi Selatan</option>
+<option value="SLT">Sulawesi Tengah</option>
+<option value="SLR">Sulawesi Tenggara</option>
+<option value="SLU">Sulawesi Utara</option>
+<option value="SMB">Sumatera Barat</option>
+<option value="SMS">Sumatera Selatan</option>
+<option value="SMU">Sumatera Utara</option>
+</select>'''
+        self.assertEqual(f.render('provinces', 'LPG'), out)
+
+    def test_IDLicensePlatePrefixSelect(self):
+        f = IDLicensePlatePrefixSelect()
+        out = u'''<select name="codes">
+<option value="A">Banten</option>
+<option value="AA">Magelang</option>
+<option value="AB">Yogyakarta</option>
+<option value="AD">Surakarta - Solo</option>
+<option value="AE">Madiun</option>
+<option value="AG">Kediri</option>
+<option value="B">Jakarta</option>
+<option value="BA">Sumatera Barat</option>
+<option value="BB">Tapanuli</option>
+<option value="BD">Bengkulu</option>
+<option value="BE" selected="selected">Lampung</option>
+<option value="BG">Sumatera Selatan</option>
+<option value="BH">Jambi</option>
+<option value="BK">Sumatera Utara</option>
+<option value="BL">Nanggroe Aceh Darussalam</option>
+<option value="BM">Riau</option>
+<option value="BN">Kepulauan Bangka Belitung</option>
+<option value="BP">Kepulauan Riau</option>
+<option value="CC">Corps Consulate</option>
+<option value="CD">Corps Diplomatic</option>
+<option value="D">Bandung</option>
+<option value="DA">Kalimantan Selatan</option>
+<option value="DB">Sulawesi Utara Daratan</option>
+<option value="DC">Sulawesi Barat</option>
+<option value="DD">Sulawesi Selatan</option>
+<option value="DE">Maluku</option>
+<option value="DG">Maluku Utara</option>
+<option value="DH">NTT - Timor</option>
+<option value="DK">Bali</option>
+<option value="DL">Sulawesi Utara Kepulauan</option>
+<option value="DM">Gorontalo</option>
+<option value="DN">Sulawesi Tengah</option>
+<option value="DR">NTB - Lombok</option>
+<option value="DS">Papua dan Papua Barat</option>
+<option value="DT">Sulawesi Tenggara</option>
+<option value="E">Cirebon</option>
+<option value="EA">NTB - Sumbawa</option>
+<option value="EB">NTT - Flores</option>
+<option value="ED">NTT - Sumba</option>
+<option value="F">Bogor</option>
+<option value="G">Pekalongan</option>
+<option value="H">Semarang</option>
+<option value="K">Pati</option>
+<option value="KB">Kalimantan Barat</option>
+<option value="KH">Kalimantan Tengah</option>
+<option value="KT">Kalimantan Timur</option>
+<option value="L">Surabaya</option>
+<option value="M">Madura</option>
+<option value="N">Malang</option>
+<option value="P">Jember</option>
+<option value="R">Banyumas</option>
+<option value="RI">Federal Government</option>
+<option value="S">Bojonegoro</option>
+<option value="T">Purwakarta</option>
+<option value="W">Sidoarjo</option>
+<option value="Z">Garut</option>
+</select>'''
+        self.assertEqual(f.render('codes', 'BE'), out)
+
+    def test_IDPhoneNumberField(self):
+        error_invalid = [u'Enter a valid phone number']
+        valid = {
+            '0812-3456789': u'0812-3456789',
+            '081234567890': u'081234567890',
+            '021 345 6789': u'021 345 6789',
+            '0213456789': u'0213456789',
+            '+62-21-3456789': u'+62-21-3456789',
+            '(021) 345 6789': u'(021) 345 6789',
+        }
+        invalid = {
+            '0123456789': error_invalid,
+            '+62-021-3456789': error_invalid,
+            '+62-021-3456789': error_invalid,
+            '+62-0812-3456789': error_invalid,
+            '0812345678901': error_invalid,
+            'foo': error_invalid,
+        }
+        self.assertFieldOutput(IDPhoneNumberField, valid, invalid)
+
+    def test_IDPostCodeField(self):
+        error_invalid = [u'Enter a valid post code']
+        valid = {
+            '12340': u'12340',
+            '25412': u'25412',
+            ' 12340 ': u'12340',
+        }
+        invalid = {
+            '12 3 4 0': error_invalid,
+            '12345': error_invalid,
+            '10100': error_invalid,
+            '123456': error_invalid,
+            'foo': error_invalid,
+        }
+        self.assertFieldOutput(IDPostCodeField, valid, invalid)
+
+    def test_IDNationalIdentityNumberField(self):
+        error_invalid = [u'Enter a valid NIK/KTP number']
+        valid = {
+            ' 12.3456.010178 3456 ': u'12.3456.010178.3456',
+            '1234560101783456': u'12.3456.010178.3456',
+            '12.3456.010101.3456': u'12.3456.010101.3456',
+        }
+        invalid = {
+            '12.3456.310278.3456': error_invalid,
+            '00.0000.010101.0000': error_invalid,
+            '1234567890123456': error_invalid,
+            'foo': error_invalid,
+        }
+        self.assertFieldOutput(IDNationalIdentityNumberField, valid, invalid)
+
+    def test_IDLicensePlateField(self):
+        error_invalid = [u'Enter a valid vehicle license plate number']
+        valid = {
+            ' b 1234  ab ': u'B 1234 AB',
+            'B 1234 ABC': u'B 1234 ABC',
+            'A 12': u'A 12',
+            'DK 12345 12': u'DK 12345 12',
+            'RI 10': u'RI 10',
+            'CD 12 12': u'CD 12 12',
+        }
+        invalid = {
+            'CD 10 12': error_invalid,
+            'CD 1234 12': error_invalid,
+            'RI 10 AB': error_invalid,
+            'B 12345 01': error_invalid,
+            'N 1234 12': error_invalid,
+            'A 12 XYZ': error_invalid,
+            'Q 1234 AB': error_invalid,
+            'foo': error_invalid,
+        }
+        self.assertFieldOutput(IDLicensePlateField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/ie.py b/parts/django/tests/regressiontests/forms/localflavor/ie.py
new file mode 100644
index 0000000..fab519b
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/ie.py
@@ -0,0 +1,43 @@
+from django.contrib.localflavor.ie.forms import IECountySelect
+
+from utils import LocalFlavorTestCase
+
+
+class IELocalFlavorTests(LocalFlavorTestCase):
+    def test_IECountySelect(self):
+        f = IECountySelect()
+        out = u'''<select name="counties">
+<option value="antrim">Antrim</option>
+<option value="armagh">Armagh</option>
+<option value="carlow">Carlow</option>
+<option value="cavan">Cavan</option>
+<option value="clare">Clare</option>
+<option value="cork">Cork</option>
+<option value="derry">Derry</option>
+<option value="donegal">Donegal</option>
+<option value="down">Down</option>
+<option value="dublin" selected="selected">Dublin</option>
+<option value="fermanagh">Fermanagh</option>
+<option value="galway">Galway</option>
+<option value="kerry">Kerry</option>
+<option value="kildare">Kildare</option>
+<option value="kilkenny">Kilkenny</option>
+<option value="laois">Laois</option>
+<option value="leitrim">Leitrim</option>
+<option value="limerick">Limerick</option>
+<option value="longford">Longford</option>
+<option value="louth">Louth</option>
+<option value="mayo">Mayo</option>
+<option value="meath">Meath</option>
+<option value="monaghan">Monaghan</option>
+<option value="offaly">Offaly</option>
+<option value="roscommon">Roscommon</option>
+<option value="sligo">Sligo</option>
+<option value="tipperary">Tipperary</option>
+<option value="tyrone">Tyrone</option>
+<option value="waterford">Waterford</option>
+<option value="westmeath">Westmeath</option>
+<option value="wexford">Wexford</option>
+<option value="wicklow">Wicklow</option>
+</select>'''
+        self.assertEqual(f.render('counties', 'dublin'), out)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/is_.py b/parts/django/tests/regressiontests/forms/localflavor/is_.py
new file mode 100644
index 0000000..fa6b133
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/is_.py
@@ -0,0 +1,199 @@
+from django.contrib.localflavor.is_.forms import (ISIdNumberField,
+    ISPhoneNumberField, ISPostalCodeSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class ISLocalFlavorTests(LocalFlavorTestCase):
+    def test_ISPostalCodeSelect(self):
+        f = ISPostalCodeSelect()
+        out = u'''<select name="foo">
+<option value="101">101 Reykjav\xedk</option>
+<option value="103">103 Reykjav\xedk</option>
+<option value="104">104 Reykjav\xedk</option>
+<option value="105">105 Reykjav\xedk</option>
+<option value="107">107 Reykjav\xedk</option>
+<option value="108">108 Reykjav\xedk</option>
+<option value="109">109 Reykjav\xedk</option>
+<option value="110">110 Reykjav\xedk</option>
+<option value="111">111 Reykjav\xedk</option>
+<option value="112">112 Reykjav\xedk</option>
+<option value="113">113 Reykjav\xedk</option>
+<option value="116">116 Kjalarnes</option>
+<option value="121">121 Reykjav\xedk</option>
+<option value="123">123 Reykjav\xedk</option>
+<option value="124">124 Reykjav\xedk</option>
+<option value="125">125 Reykjav\xedk</option>
+<option value="127">127 Reykjav\xedk</option>
+<option value="128">128 Reykjav\xedk</option>
+<option value="129">129 Reykjav\xedk</option>
+<option value="130">130 Reykjav\xedk</option>
+<option value="132">132 Reykjav\xedk</option>
+<option value="150">150 Reykjav\xedk</option>
+<option value="155">155 Reykjav\xedk</option>
+<option value="170">170 Seltjarnarnes</option>
+<option value="172">172 Seltjarnarnes</option>
+<option value="190">190 Vogar</option>
+<option value="200">200 K\xf3pavogur</option>
+<option value="201">201 K\xf3pavogur</option>
+<option value="202">202 K\xf3pavogur</option>
+<option value="203">203 K\xf3pavogur</option>
+<option value="210">210 Gar\xf0ab\xe6r</option>
+<option value="212">212 Gar\xf0ab\xe6r</option>
+<option value="220">220 Hafnarfj\xf6r\xf0ur</option>
+<option value="221">221 Hafnarfj\xf6r\xf0ur</option>
+<option value="222">222 Hafnarfj\xf6r\xf0ur</option>
+<option value="225">225 \xc1lftanes</option>
+<option value="230">230 Reykjanesb\xe6r</option>
+<option value="232">232 Reykjanesb\xe6r</option>
+<option value="233">233 Reykjanesb\xe6r</option>
+<option value="235">235 Keflav\xedkurflugv\xf6llur</option>
+<option value="240">240 Grindav\xedk</option>
+<option value="245">245 Sandger\xf0i</option>
+<option value="250">250 Gar\xf0ur</option>
+<option value="260">260 Reykjanesb\xe6r</option>
+<option value="270">270 Mosfellsb\xe6r</option>
+<option value="300">300 Akranes</option>
+<option value="301">301 Akranes</option>
+<option value="302">302 Akranes</option>
+<option value="310">310 Borgarnes</option>
+<option value="311">311 Borgarnes</option>
+<option value="320">320 Reykholt \xed Borgarfir\xf0i</option>
+<option value="340">340 Stykkish\xf3lmur</option>
+<option value="345">345 Flatey \xe1 Brei\xf0afir\xf0i</option>
+<option value="350">350 Grundarfj\xf6r\xf0ur</option>
+<option value="355">355 \xd3lafsv\xedk</option>
+<option value="356">356 Sn\xe6fellsb\xe6r</option>
+<option value="360">360 Hellissandur</option>
+<option value="370">370 B\xfa\xf0ardalur</option>
+<option value="371">371 B\xfa\xf0ardalur</option>
+<option value="380">380 Reykh\xf3lahreppur</option>
+<option value="400">400 \xcdsafj\xf6r\xf0ur</option>
+<option value="401">401 \xcdsafj\xf6r\xf0ur</option>
+<option value="410">410 Hn\xedfsdalur</option>
+<option value="415">415 Bolungarv\xedk</option>
+<option value="420">420 S\xfa\xf0av\xedk</option>
+<option value="425">425 Flateyri</option>
+<option value="430">430 Su\xf0ureyri</option>
+<option value="450">450 Patreksfj\xf6r\xf0ur</option>
+<option value="451">451 Patreksfj\xf6r\xf0ur</option>
+<option value="460">460 T\xe1lknafj\xf6r\xf0ur</option>
+<option value="465">465 B\xedldudalur</option>
+<option value="470">470 \xdeingeyri</option>
+<option value="471">471 \xdeingeyri</option>
+<option value="500">500 Sta\xf0ur</option>
+<option value="510">510 H\xf3lmav\xedk</option>
+<option value="512">512 H\xf3lmav\xedk</option>
+<option value="520">520 Drangsnes</option>
+<option value="522">522 Kj\xf6rvogur</option>
+<option value="523">523 B\xe6r</option>
+<option value="524">524 Nor\xf0urfj\xf6r\xf0ur</option>
+<option value="530">530 Hvammstangi</option>
+<option value="531">531 Hvammstangi</option>
+<option value="540">540 Bl\xf6ndu\xf3s</option>
+<option value="541">541 Bl\xf6ndu\xf3s</option>
+<option value="545">545 Skagastr\xf6nd</option>
+<option value="550">550 Sau\xf0\xe1rkr\xf3kur</option>
+<option value="551">551 Sau\xf0\xe1rkr\xf3kur</option>
+<option value="560">560 Varmahl\xed\xf0</option>
+<option value="565">565 Hofs\xf3s</option>
+<option value="566">566 Hofs\xf3s</option>
+<option value="570">570 Flj\xf3t</option>
+<option value="580">580 Siglufj\xf6r\xf0ur</option>
+<option value="600">600 Akureyri</option>
+<option value="601">601 Akureyri</option>
+<option value="602">602 Akureyri</option>
+<option value="603">603 Akureyri</option>
+<option value="610">610 Greniv\xedk</option>
+<option value="611">611 Gr\xedmsey</option>
+<option value="620">620 Dalv\xedk</option>
+<option value="621">621 Dalv\xedk</option>
+<option value="625">625 \xd3lafsfj\xf6r\xf0ur</option>
+<option value="630">630 Hr\xedsey</option>
+<option value="640">640 H\xfasav\xedk</option>
+<option value="641">641 H\xfasav\xedk</option>
+<option value="645">645 Fossh\xf3ll</option>
+<option value="650">650 Laugar</option>
+<option value="660">660 M\xfdvatn</option>
+<option value="670">670 K\xf3pasker</option>
+<option value="671">671 K\xf3pasker</option>
+<option value="675">675 Raufarh\xf6fn</option>
+<option value="680">680 \xde\xf3rsh\xf6fn</option>
+<option value="681">681 \xde\xf3rsh\xf6fn</option>
+<option value="685">685 Bakkafj\xf6r\xf0ur</option>
+<option value="690">690 Vopnafj\xf6r\xf0ur</option>
+<option value="700">700 Egilssta\xf0ir</option>
+<option value="701">701 Egilssta\xf0ir</option>
+<option value="710">710 Sey\xf0isfj\xf6r\xf0ur</option>
+<option value="715">715 Mj\xf3ifj\xf6r\xf0ur</option>
+<option value="720">720 Borgarfj\xf6r\xf0ur eystri</option>
+<option value="730">730 Rey\xf0arfj\xf6r\xf0ur</option>
+<option value="735">735 Eskifj\xf6r\xf0ur</option>
+<option value="740">740 Neskaupsta\xf0ur</option>
+<option value="750">750 F\xe1skr\xfa\xf0sfj\xf6r\xf0ur</option>
+<option value="755">755 St\xf6\xf0varfj\xf6r\xf0ur</option>
+<option value="760">760 Brei\xf0dalsv\xedk</option>
+<option value="765">765 Dj\xfapivogur</option>
+<option value="780">780 H\xf6fn \xed Hornafir\xf0i</option>
+<option value="781">781 H\xf6fn \xed Hornafir\xf0i</option>
+<option value="785">785 \xd6r\xe6fi</option>
+<option value="800">800 Selfoss</option>
+<option value="801">801 Selfoss</option>
+<option value="802">802 Selfoss</option>
+<option value="810">810 Hverager\xf0i</option>
+<option value="815">815 \xdeorl\xe1ksh\xf6fn</option>
+<option value="820">820 Eyrarbakki</option>
+<option value="825">825 Stokkseyri</option>
+<option value="840">840 Laugarvatn</option>
+<option value="845">845 Fl\xfa\xf0ir</option>
+<option value="850">850 Hella</option>
+<option value="851">851 Hella</option>
+<option value="860">860 Hvolsv\xf6llur</option>
+<option value="861">861 Hvolsv\xf6llur</option>
+<option value="870">870 V\xedk</option>
+<option value="871">871 V\xedk</option>
+<option value="880">880 Kirkjub\xe6jarklaustur</option>
+<option value="900">900 Vestmannaeyjar</option>
+<option value="902">902 Vestmannaeyjar</option>
+</select>'''
+        self.assertEqual(f.render('foo', 'bar'), out)
+    
+    def test_ISIdNumberField(self):
+        error_atleast = [u'Ensure this value has at least 10 characters (it has 9).']
+        error_invalid = [u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.']
+        error_atmost = [u'Ensure this value has at most 11 characters (it has 12).']
+        error_notvalid = [u'The Icelandic identification number is not valid.']
+        valid = {
+            '2308803449': '230880-3449',
+            '230880-3449': '230880-3449',
+            '230880 3449': '230880-3449',
+            '2308803440': '230880-3440',
+        }
+        invalid = {
+            '230880343': error_atleast + error_invalid,
+            '230880343234': error_atmost + error_invalid,
+            'abcdefghijk': error_invalid,
+            '2308803439': error_notvalid,
+        
+        }
+        self.assertFieldOutput(ISIdNumberField, valid, invalid)
+    
+    def test_ISPhoneNumberField(self):
+        error_invalid = [u'Enter a valid value.']
+        error_atleast = [u'Ensure this value has at least 7 characters (it has 6).']
+        error_atmost = [u'Ensure this value has at most 8 characters (it has 9).']
+        valid = {
+            '1234567': '1234567',
+            '123 4567': '1234567',
+            '123-4567': '1234567',
+        }
+        invalid = {
+            '123-456': error_invalid,
+            '123456': error_atleast + error_invalid,
+            '123456555': error_atmost + error_invalid,
+            'abcdefg': error_invalid,
+            ' 1234567 ': error_atmost + error_invalid,
+            ' 12367  ': error_invalid
+        }
+        self.assertFieldOutput(ISPhoneNumberField, valid, invalid)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/it.py b/parts/django/tests/regressiontests/forms/localflavor/it.py
new file mode 100644
index 0000000..7181e25
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/it.py
@@ -0,0 +1,70 @@
+from django.contrib.localflavor.it.forms import (ITZipCodeField, ITRegionSelect,
+    ITSocialSecurityNumberField, ITVatNumberField)
+
+from utils import LocalFlavorTestCase
+
+
+class ITLocalFlavorTests(LocalFlavorTestCase):
+    def test_ITRegionSelect(self):
+        f = ITRegionSelect()
+        out = u'''<select name="regions">
+<option value="ABR">Abruzzo</option>
+<option value="BAS">Basilicata</option>
+<option value="CAL">Calabria</option>
+<option value="CAM">Campania</option>
+<option value="EMR">Emilia-Romagna</option>
+<option value="FVG">Friuli-Venezia Giulia</option>
+<option value="LAZ">Lazio</option>
+<option value="LIG">Liguria</option>
+<option value="LOM">Lombardia</option>
+<option value="MAR">Marche</option>
+<option value="MOL">Molise</option>
+<option value="PMN" selected="selected">Piemonte</option>
+<option value="PUG">Puglia</option>
+<option value="SAR">Sardegna</option>
+<option value="SIC">Sicilia</option>
+<option value="TOS">Toscana</option>
+<option value="TAA">Trentino-Alto Adige</option>
+<option value="UMB">Umbria</option>
+<option value="VAO">Valle d\u2019Aosta</option>
+<option value="VEN">Veneto</option>
+</select>'''
+        self.assertEqual(f.render('regions', 'PMN'), out)
+
+    def test_ITZipCodeField(self):
+        error_invalid = [u'Enter a valid zip code.']
+        valid = {
+            '00100': '00100',
+        }
+        invalid = {
+            ' 00100': error_invalid,
+        }
+        self.assertFieldOutput(ITZipCodeField, valid, invalid)
+    
+    def test_ITSocialSecurityNumberField(self):
+        error_invalid = [u'Enter a valid Social Security number.']
+        valid = {
+            'LVSGDU99T71H501L': 'LVSGDU99T71H501L',
+            'LBRRME11A01L736W': 'LBRRME11A01L736W',
+            'lbrrme11a01l736w': 'LBRRME11A01L736W',
+            'LBR RME 11A01 L736W': 'LBRRME11A01L736W',
+        }
+        invalid = {
+            'LBRRME11A01L736A': error_invalid,
+            '%BRRME11A01L736W': error_invalid,
+        }
+        self.assertFieldOutput(ITSocialSecurityNumberField, valid, invalid)
+    
+    def test_ITVatNumberField(self):
+        error_invalid = [u'Enter a valid VAT number.']
+        valid = {
+            '07973780013': '07973780013',
+            '7973780013': '07973780013',
+            7973780013: '07973780013',
+        }
+        invalid = {
+            '07973780014': error_invalid,
+            'A7973780013': error_invalid,
+        }
+        self.assertFieldOutput(ITVatNumberField, valid, invalid)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/jp.py b/parts/django/tests/regressiontests/forms/localflavor/jp.py
new file mode 100644
index 0000000..1f8362a
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/jp.py
@@ -0,0 +1,73 @@
+from django.contrib.localflavor.jp.forms import (JPPostalCodeField,
+    JPPrefectureSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class JPLocalFlavorTests(LocalFlavorTestCase):
+    def test_JPPrefectureSelect(self):
+        f = JPPrefectureSelect()
+        out = u'''<select name="prefecture">
+<option value="hokkaido">Hokkaido</option>
+<option value="aomori">Aomori</option>
+<option value="iwate">Iwate</option>
+<option value="miyagi">Miyagi</option>
+<option value="akita">Akita</option>
+<option value="yamagata">Yamagata</option>
+<option value="fukushima">Fukushima</option>
+<option value="ibaraki">Ibaraki</option>
+<option value="tochigi">Tochigi</option>
+<option value="gunma">Gunma</option>
+<option value="saitama">Saitama</option>
+<option value="chiba">Chiba</option>
+<option value="tokyo">Tokyo</option>
+<option value="kanagawa" selected="selected">Kanagawa</option>
+<option value="yamanashi">Yamanashi</option>
+<option value="nagano">Nagano</option>
+<option value="niigata">Niigata</option>
+<option value="toyama">Toyama</option>
+<option value="ishikawa">Ishikawa</option>
+<option value="fukui">Fukui</option>
+<option value="gifu">Gifu</option>
+<option value="shizuoka">Shizuoka</option>
+<option value="aichi">Aichi</option>
+<option value="mie">Mie</option>
+<option value="shiga">Shiga</option>
+<option value="kyoto">Kyoto</option>
+<option value="osaka">Osaka</option>
+<option value="hyogo">Hyogo</option>
+<option value="nara">Nara</option>
+<option value="wakayama">Wakayama</option>
+<option value="tottori">Tottori</option>
+<option value="shimane">Shimane</option>
+<option value="okayama">Okayama</option>
+<option value="hiroshima">Hiroshima</option>
+<option value="yamaguchi">Yamaguchi</option>
+<option value="tokushima">Tokushima</option>
+<option value="kagawa">Kagawa</option>
+<option value="ehime">Ehime</option>
+<option value="kochi">Kochi</option>
+<option value="fukuoka">Fukuoka</option>
+<option value="saga">Saga</option>
+<option value="nagasaki">Nagasaki</option>
+<option value="kumamoto">Kumamoto</option>
+<option value="oita">Oita</option>
+<option value="miyazaki">Miyazaki</option>
+<option value="kagoshima">Kagoshima</option>
+<option value="okinawa">Okinawa</option>
+</select>'''
+        self.assertEqual(f.render('prefecture', 'kanagawa'), out)
+
+    def test_JPPostalCodeField(self):
+        error_format = [u'Enter a postal code in the format XXXXXXX or XXX-XXXX.']
+        valid = {
+                '251-0032': '2510032',
+                '2510032': '2510032',
+        }
+        invalid = {
+                '2510-032': error_format,
+                '251a0032': error_format,
+                'a51-0032': error_format,
+                '25100321': error_format,
+        }
+        self.assertFieldOutput(JPPostalCodeField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/kw.py b/parts/django/tests/regressiontests/forms/localflavor/kw.py
new file mode 100644
index 0000000..af998bd
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/kw.py
@@ -0,0 +1,16 @@
+from django.contrib.localflavor.kw.forms import KWCivilIDNumberField
+
+from utils import LocalFlavorTestCase
+
+
+class KWLocalFlavorTests(LocalFlavorTestCase):
+    def test_KWCivilIDNumberField(self):
+        error_invalid = [u'Enter a valid Kuwaiti Civil ID number']
+        valid = {
+            '282040701483': '282040701483',
+        }
+        invalid = {
+            '289332013455': error_invalid,
+        }
+        self.assertFieldOutput(KWCivilIDNumberField, valid, invalid)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/nl.py b/parts/django/tests/regressiontests/forms/localflavor/nl.py
new file mode 100644
index 0000000..8ef0ae9
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/nl.py
@@ -0,0 +1,62 @@
+from django.contrib.localflavor.nl.forms import (NLPhoneNumberField,
+    NLZipCodeField, NLSoFiNumberField, NLProvinceSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class NLLocalFlavorTests(LocalFlavorTestCase):
+    def test_NLProvinceSelect(self):
+        f = NLProvinceSelect()
+        out = u'''<select name="provinces">
+<option value="DR">Drenthe</option>
+<option value="FL">Flevoland</option>
+<option value="FR">Friesland</option>
+<option value="GL">Gelderland</option>
+<option value="GR">Groningen</option>
+<option value="LB">Limburg</option>
+<option value="NB">Noord-Brabant</option>
+<option value="NH">Noord-Holland</option>
+<option value="OV" selected="selected">Overijssel</option>
+<option value="UT">Utrecht</option>
+<option value="ZE">Zeeland</option>
+<option value="ZH">Zuid-Holland</option>
+</select>'''
+        self.assertEqual(f.render('provinces', 'OV'), out)
+
+    def test_NLPhoneNumberField(self):
+        error_invalid = [u'Enter a valid phone number']
+        valid = {
+                '012-3456789': '012-3456789',
+                '0123456789': '0123456789',
+                '+31-12-3456789': '+31-12-3456789',
+                '(0123) 456789': '(0123) 456789',
+        }
+        invalid = {
+                'foo': error_invalid,
+        }
+        self.assertFieldOutput(NLPhoneNumberField, valid, invalid)
+
+    def test_NLZipCodeField(self):
+        error_invalid = [u'Enter a valid postal code']
+        valid = {
+            '1234ab': '1234 AB',
+            '1234 ab': '1234 AB',
+            '1234 AB': '1234 AB',
+        }
+        invalid = {
+            '0123AB': error_invalid,
+            'foo': error_invalid,
+        }
+        self.assertFieldOutput(NLZipCodeField, valid, invalid)
+
+    def test_NLSoFiNumberField(self):
+        error_invalid = [u'Enter a valid SoFi number']
+        valid = {
+            '123456782': '123456782',
+        }
+        invalid = {
+            '000000000': error_invalid,
+            '123456789': error_invalid,
+            'foo': error_invalid,
+        }
+        self.assertFieldOutput(NLSoFiNumberField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/pl.py b/parts/django/tests/regressiontests/forms/localflavor/pl.py
new file mode 100644
index 0000000..51721f8
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/pl.py
@@ -0,0 +1,462 @@
+from django.contrib.localflavor.pl.forms import (PLProvinceSelect,
+    PLCountySelect, PLPostalCodeField, PLNIPField, PLPESELField, PLREGONField)
+
+from utils import LocalFlavorTestCase
+
+
+class PLLocalFlavorTests(LocalFlavorTestCase):
+    def test_PLProvinceSelect(self):
+        f = PLProvinceSelect()
+        out = u'''<select name="voivodeships">
+<option value="lower_silesia">Lower Silesia</option>
+<option value="kuyavia-pomerania">Kuyavia-Pomerania</option>
+<option value="lublin">Lublin</option>
+<option value="lubusz">Lubusz</option>
+<option value="lodz">Lodz</option>
+<option value="lesser_poland">Lesser Poland</option>
+<option value="masovia">Masovia</option>
+<option value="opole">Opole</option>
+<option value="subcarpatia">Subcarpatia</option>
+<option value="podlasie">Podlasie</option>
+<option value="pomerania" selected="selected">Pomerania</option>
+<option value="silesia">Silesia</option>
+<option value="swietokrzyskie">Swietokrzyskie</option>
+<option value="warmia-masuria">Warmia-Masuria</option>
+<option value="greater_poland">Greater Poland</option>
+<option value="west_pomerania">West Pomerania</option>
+</select>'''
+        self.assertEqual(f.render('voivodeships', 'pomerania'), out)
+    
+    def test_PLCountrySelect(self):
+        f = PLCountySelect()
+        out = u'''<select name="administrativeunit">
+<option value="wroclaw">Wroc\u0142aw</option>
+<option value="jeleniagora">Jelenia G\xf3ra</option>
+<option value="legnica">Legnica</option>
+<option value="boleslawiecki">boles\u0142awiecki</option>
+<option value="dzierzoniowski">dzier\u017coniowski</option>
+<option value="glogowski">g\u0142ogowski</option>
+<option value="gorowski">g\xf3rowski</option>
+<option value="jaworski">jaworski</option>
+<option value="jeleniogorski">jeleniog\xf3rski</option>
+<option value="kamiennogorski">kamiennog\xf3rski</option>
+<option value="klodzki">k\u0142odzki</option>
+<option value="legnicki">legnicki</option>
+<option value="lubanski">luba\u0144ski</option>
+<option value="lubinski">lubi\u0144ski</option>
+<option value="lwowecki">lw\xf3wecki</option>
+<option value="milicki">milicki</option>
+<option value="olesnicki">ole\u015bnicki</option>
+<option value="olawski">o\u0142awski</option>
+<option value="polkowicki">polkowicki</option>
+<option value="strzelinski">strzeli\u0144ski</option>
+<option value="sredzki">\u015bredzki</option>
+<option value="swidnicki">\u015bwidnicki</option>
+<option value="trzebnicki">trzebnicki</option>
+<option value="walbrzyski">wa\u0142brzyski</option>
+<option value="wolowski">wo\u0142owski</option>
+<option value="wroclawski">wroc\u0142awski</option>
+<option value="zabkowicki">z\u0105bkowicki</option>
+<option value="zgorzelecki">zgorzelecki</option>
+<option value="zlotoryjski">z\u0142otoryjski</option>
+<option value="bydgoszcz">Bydgoszcz</option>
+<option value="torun">Toru\u0144</option>
+<option value="wloclawek">W\u0142oc\u0142awek</option>
+<option value="grudziadz">Grudzi\u0105dz</option>
+<option value="aleksandrowski">aleksandrowski</option>
+<option value="brodnicki">brodnicki</option>
+<option value="bydgoski">bydgoski</option>
+<option value="chelminski">che\u0142mi\u0144ski</option>
+<option value="golubsko-dobrzynski">golubsko-dobrzy\u0144ski</option>
+<option value="grudziadzki">grudzi\u0105dzki</option>
+<option value="inowroclawski">inowroc\u0142awski</option>
+<option value="lipnowski">lipnowski</option>
+<option value="mogilenski">mogile\u0144ski</option>
+<option value="nakielski">nakielski</option>
+<option value="radziejowski">radziejowski</option>
+<option value="rypinski">rypi\u0144ski</option>
+<option value="sepolenski">s\u0119pole\u0144ski</option>
+<option value="swiecki">\u015bwiecki</option>
+<option value="torunski">toru\u0144ski</option>
+<option value="tucholski">tucholski</option>
+<option value="wabrzeski">w\u0105brzeski</option>
+<option value="wloclawski">wroc\u0142awski</option>
+<option value="zninski">\u017ani\u0144ski</option>
+<option value="lublin">Lublin</option>
+<option value="biala-podlaska">Bia\u0142a Podlaska</option>
+<option value="chelm">Che\u0142m</option>
+<option value="zamosc">Zamo\u015b\u0107</option>
+<option value="bialski">bialski</option>
+<option value="bilgorajski">bi\u0142gorajski</option>
+<option value="chelmski">che\u0142mski</option>
+<option value="hrubieszowski">hrubieszowski</option>
+<option value="janowski">janowski</option>
+<option value="krasnostawski">krasnostawski</option>
+<option value="krasnicki">kra\u015bnicki</option>
+<option value="lubartowski">lubartowski</option>
+<option value="lubelski">lubelski</option>
+<option value="leczynski">\u0142\u0119czy\u0144ski</option>
+<option value="lukowski">\u0142ukowski</option>
+<option value="opolski">opolski</option>
+<option value="parczewski">parczewski</option>
+<option value="pulawski">pu\u0142awski</option>
+<option value="radzynski">radzy\u0144ski</option>
+<option value="rycki">rycki</option>
+<option value="swidnicki">\u015bwidnicki</option>
+<option value="tomaszowski">tomaszowski</option>
+<option value="wlodawski">w\u0142odawski</option>
+<option value="zamojski">zamojski</option>
+<option value="gorzow-wielkopolski">Gorz\xf3w Wielkopolski</option>
+<option value="zielona-gora">Zielona G\xf3ra</option>
+<option value="gorzowski">gorzowski</option>
+<option value="krosnienski">kro\u015bnie\u0144ski</option>
+<option value="miedzyrzecki">mi\u0119dzyrzecki</option>
+<option value="nowosolski">nowosolski</option>
+<option value="slubicki">s\u0142ubicki</option>
+<option value="strzelecko-drezdenecki">strzelecko-drezdenecki</option>
+<option value="sulecinski">sule\u0144ci\u0144ski</option>
+<option value="swiebodzinski">\u015bwiebodzi\u0144ski</option>
+<option value="wschowski">wschowski</option>
+<option value="zielonogorski">zielonog\xf3rski</option>
+<option value="zaganski">\u017caga\u0144ski</option>
+<option value="zarski">\u017carski</option>
+<option value="lodz">\u0141\xf3d\u017a</option>
+<option value="piotrkow-trybunalski">Piotrk\xf3w Trybunalski</option>
+<option value="skierniewice">Skierniewice</option>
+<option value="belchatowski">be\u0142chatowski</option>
+<option value="brzezinski">brzezi\u0144ski</option>
+<option value="kutnowski">kutnowski</option>
+<option value="laski">\u0142aski</option>
+<option value="leczycki">\u0142\u0119czycki</option>
+<option value="lowicki">\u0142owicki</option>
+<option value="lodzki wschodni">\u0142\xf3dzki wschodni</option>
+<option value="opoczynski">opoczy\u0144ski</option>
+<option value="pabianicki">pabianicki</option>
+<option value="pajeczanski">paj\u0119cza\u0144ski</option>
+<option value="piotrkowski">piotrkowski</option>
+<option value="poddebicki">podd\u0119bicki</option>
+<option value="radomszczanski">radomszcza\u0144ski</option>
+<option value="rawski">rawski</option>
+<option value="sieradzki">sieradzki</option>
+<option value="skierniewicki">skierniewicki</option>
+<option value="tomaszowski">tomaszowski</option>
+<option value="wielunski">wielu\u0144ski</option>
+<option value="wieruszowski">wieruszowski</option>
+<option value="zdunskowolski">zdu\u0144skowolski</option>
+<option value="zgierski">zgierski</option>
+<option value="krakow">Krak\xf3w</option>
+<option value="tarnow">Tarn\xf3w</option>
+<option value="nowy-sacz">Nowy S\u0105cz</option>
+<option value="bochenski">boche\u0144ski</option>
+<option value="brzeski">brzeski</option>
+<option value="chrzanowski">chrzanowski</option>
+<option value="dabrowski">d\u0105browski</option>
+<option value="gorlicki">gorlicki</option>
+<option value="krakowski">krakowski</option>
+<option value="limanowski">limanowski</option>
+<option value="miechowski">miechowski</option>
+<option value="myslenicki">my\u015blenicki</option>
+<option value="nowosadecki">nowos\u0105decki</option>
+<option value="nowotarski">nowotarski</option>
+<option value="olkuski">olkuski</option>
+<option value="oswiecimski">o\u015bwi\u0119cimski</option>
+<option value="proszowicki">proszowicki</option>
+<option value="suski">suski</option>
+<option value="tarnowski">tarnowski</option>
+<option value="tatrzanski">tatrza\u0144ski</option>
+<option value="wadowicki">wadowicki</option>
+<option value="wielicki">wielicki</option>
+<option value="warszawa">Warszawa</option>
+<option value="ostroleka">Ostro\u0142\u0119ka</option>
+<option value="plock">P\u0142ock</option>
+<option value="radom">Radom</option>
+<option value="siedlce">Siedlce</option>
+<option value="bialobrzeski">bia\u0142obrzeski</option>
+<option value="ciechanowski">ciechanowski</option>
+<option value="garwolinski">garwoli\u0144ski</option>
+<option value="gostyninski">gostyni\u0144ski</option>
+<option value="grodziski">grodziski</option>
+<option value="grojecki">gr\xf3jecki</option>
+<option value="kozienicki">kozenicki</option>
+<option value="legionowski">legionowski</option>
+<option value="lipski">lipski</option>
+<option value="losicki">\u0142osicki</option>
+<option value="makowski">makowski</option>
+<option value="minski">mi\u0144ski</option>
+<option value="mlawski">m\u0142awski</option>
+<option value="nowodworski">nowodworski</option>
+<option value="ostrolecki">ostro\u0142\u0119cki</option>
+<option value="ostrowski">ostrowski</option>
+<option value="otwocki">otwocki</option>
+<option value="piaseczynski">piaseczy\u0144ski</option>
+<option value="plocki">p\u0142ocki</option>
+<option value="plonski">p\u0142o\u0144ski</option>
+<option value="pruszkowski">pruszkowski</option>
+<option value="przasnyski">przasnyski</option>
+<option value="przysuski">przysuski</option>
+<option value="pultuski">pu\u0142tuski</option>
+<option value="radomski">radomski</option>
+<option value="siedlecki">siedlecki</option>
+<option value="sierpecki">sierpecki</option>
+<option value="sochaczewski">sochaczewski</option>
+<option value="sokolowski">soko\u0142owski</option>
+<option value="szydlowiecki">szyd\u0142owiecki</option>
+<option value="warszawski-zachodni">warszawski zachodni</option>
+<option value="wegrowski">w\u0119growski</option>
+<option value="wolominski">wo\u0142omi\u0144ski</option>
+<option value="wyszkowski">wyszkowski</option>
+<option value="zwolenski">zwole\u0144ski</option>
+<option value="zurominski">\u017curomi\u0144ski</option>
+<option value="zyrardowski">\u017cyrardowski</option>
+<option value="opole">Opole</option>
+<option value="brzeski">brzeski</option>
+<option value="glubczycki">g\u0142ubczyski</option>
+<option value="kedzierzynsko-kozielski">k\u0119dzierzy\u0144ski-kozielski</option>
+<option value="kluczborski">kluczborski</option>
+<option value="krapkowicki">krapkowicki</option>
+<option value="namyslowski">namys\u0142owski</option>
+<option value="nyski">nyski</option>
+<option value="oleski">oleski</option>
+<option value="opolski">opolski</option>
+<option value="prudnicki">prudnicki</option>
+<option value="strzelecki">strzelecki</option>
+<option value="rzeszow">Rzesz\xf3w</option>
+<option value="krosno">Krosno</option>
+<option value="przemysl">Przemy\u015bl</option>
+<option value="tarnobrzeg">Tarnobrzeg</option>
+<option value="bieszczadzki">bieszczadzki</option>
+<option value="brzozowski">brzozowski</option>
+<option value="debicki">d\u0119bicki</option>
+<option value="jaroslawski">jaros\u0142awski</option>
+<option value="jasielski">jasielski</option>
+<option value="kolbuszowski">kolbuszowski</option>
+<option value="krosnienski">kro\u015bnie\u0144ski</option>
+<option value="leski">leski</option>
+<option value="lezajski">le\u017cajski</option>
+<option value="lubaczowski">lubaczowski</option>
+<option value="lancucki">\u0142a\u0144cucki</option>
+<option value="mielecki">mielecki</option>
+<option value="nizanski">ni\u017ca\u0144ski</option>
+<option value="przemyski">przemyski</option>
+<option value="przeworski">przeworski</option>
+<option value="ropczycko-sedziszowski">ropczycko-s\u0119dziszowski</option>
+<option value="rzeszowski">rzeszowski</option>
+<option value="sanocki">sanocki</option>
+<option value="stalowowolski">stalowowolski</option>
+<option value="strzyzowski">strzy\u017cowski</option>
+<option value="tarnobrzeski">tarnobrzeski</option>
+<option value="bialystok">Bia\u0142ystok</option>
+<option value="lomza">\u0141om\u017ca</option>
+<option value="suwalki">Suwa\u0142ki</option>
+<option value="augustowski">augustowski</option>
+<option value="bialostocki">bia\u0142ostocki</option>
+<option value="bielski">bielski</option>
+<option value="grajewski">grajewski</option>
+<option value="hajnowski">hajnowski</option>
+<option value="kolnenski">kolne\u0144ski</option>
+<option value="\u0142omzynski">\u0142om\u017cy\u0144ski</option>
+<option value="moniecki">moniecki</option>
+<option value="sejnenski">sejne\u0144ski</option>
+<option value="siemiatycki">siematycki</option>
+<option value="sokolski">sok\xf3lski</option>
+<option value="suwalski">suwalski</option>
+<option value="wysokomazowiecki">wysokomazowiecki</option>
+<option value="zambrowski">zambrowski</option>
+<option value="gdansk">Gda\u0144sk</option>
+<option value="gdynia">Gdynia</option>
+<option value="slupsk">S\u0142upsk</option>
+<option value="sopot">Sopot</option>
+<option value="bytowski">bytowski</option>
+<option value="chojnicki">chojnicki</option>
+<option value="czluchowski">cz\u0142uchowski</option>
+<option value="kartuski">kartuski</option>
+<option value="koscierski">ko\u015bcierski</option>
+<option value="kwidzynski">kwidzy\u0144ski</option>
+<option value="leborski">l\u0119borski</option>
+<option value="malborski">malborski</option>
+<option value="nowodworski">nowodworski</option>
+<option value="gdanski">gda\u0144ski</option>
+<option value="pucki">pucki</option>
+<option value="slupski">s\u0142upski</option>
+<option value="starogardzki">starogardzki</option>
+<option value="sztumski">sztumski</option>
+<option value="tczewski">tczewski</option>
+<option value="wejherowski">wejcherowski</option>
+<option value="katowice" selected="selected">Katowice</option>
+<option value="bielsko-biala">Bielsko-Bia\u0142a</option>
+<option value="bytom">Bytom</option>
+<option value="chorzow">Chorz\xf3w</option>
+<option value="czestochowa">Cz\u0119stochowa</option>
+<option value="dabrowa-gornicza">D\u0105browa G\xf3rnicza</option>
+<option value="gliwice">Gliwice</option>
+<option value="jastrzebie-zdroj">Jastrz\u0119bie Zdr\xf3j</option>
+<option value="jaworzno">Jaworzno</option>
+<option value="myslowice">Mys\u0142owice</option>
+<option value="piekary-slaskie">Piekary \u015al\u0105skie</option>
+<option value="ruda-slaska">Ruda \u015al\u0105ska</option>
+<option value="rybnik">Rybnik</option>
+<option value="siemianowice-slaskie">Siemianowice \u015al\u0105skie</option>
+<option value="sosnowiec">Sosnowiec</option>
+<option value="swietochlowice">\u015awi\u0119toch\u0142owice</option>
+<option value="tychy">Tychy</option>
+<option value="zabrze">Zabrze</option>
+<option value="zory">\u017bory</option>
+<option value="bedzinski">b\u0119dzi\u0144ski</option>
+<option value="bielski">bielski</option>
+<option value="bierunsko-ledzinski">bieru\u0144sko-l\u0119dzi\u0144ski</option>
+<option value="cieszynski">cieszy\u0144ski</option>
+<option value="czestochowski">cz\u0119stochowski</option>
+<option value="gliwicki">gliwicki</option>
+<option value="klobucki">k\u0142obucki</option>
+<option value="lubliniecki">lubliniecki</option>
+<option value="mikolowski">miko\u0142owski</option>
+<option value="myszkowski">myszkowski</option>
+<option value="pszczynski">pszczy\u0144ski</option>
+<option value="raciborski">raciborski</option>
+<option value="rybnicki">rybnicki</option>
+<option value="tarnogorski">tarnog\xf3rski</option>
+<option value="wodzislawski">wodzis\u0142awski</option>
+<option value="zawiercianski">zawiercia\u0144ski</option>
+<option value="zywiecki">\u017cywiecki</option>
+<option value="kielce">Kielce</option>
+<option value="buski">buski</option>
+<option value="jedrzejowski">j\u0119drzejowski</option>
+<option value="kazimierski">kazimierski</option>
+<option value="kielecki">kielecki</option>
+<option value="konecki">konecki</option>
+<option value="opatowski">opatowski</option>
+<option value="ostrowiecki">ostrowiecki</option>
+<option value="pinczowski">pi\u0144czowski</option>
+<option value="sandomierski">sandomierski</option>
+<option value="skarzyski">skar\u017cyski</option>
+<option value="starachowicki">starachowicki</option>
+<option value="staszowski">staszowski</option>
+<option value="wloszczowski">w\u0142oszczowski</option>
+<option value="olsztyn">Olsztyn</option>
+<option value="elblag">Elbl\u0105g</option>
+<option value="bartoszycki">bartoszycki</option>
+<option value="braniewski">braniewski</option>
+<option value="dzialdowski">dzia\u0142dowski</option>
+<option value="elblaski">elbl\u0105ski</option>
+<option value="elcki">e\u0142cki</option>
+<option value="gizycki">gi\u017cycki</option>
+<option value="goldapski">go\u0142dapski</option>
+<option value="ilawski">i\u0142awski</option>
+<option value="ketrzynski">k\u0119trzy\u0144ski</option>
+<option value="lidzbarski">lidzbarski</option>
+<option value="mragowski">mr\u0105gowski</option>
+<option value="nidzicki">nidzicki</option>
+<option value="nowomiejski">nowomiejski</option>
+<option value="olecki">olecki</option>
+<option value="olsztynski">olszty\u0144ski</option>
+<option value="ostrodzki">ostr\xf3dzki</option>
+<option value="piski">piski</option>
+<option value="szczycienski">szczycie\u0144ski</option>
+<option value="wegorzewski">w\u0119gorzewski</option>
+<option value="poznan">Pozna\u0144</option>
+<option value="kalisz">Kalisz</option>
+<option value="konin">Konin</option>
+<option value="leszno">Leszno</option>
+<option value="chodzieski">chodziejski</option>
+<option value="czarnkowsko-trzcianecki">czarnkowsko-trzcianecki</option>
+<option value="gnieznienski">gnie\u017anie\u0144ski</option>
+<option value="gostynski">gosty\u0144ski</option>
+<option value="grodziski">grodziski</option>
+<option value="jarocinski">jaroci\u0144ski</option>
+<option value="kaliski">kaliski</option>
+<option value="kepinski">k\u0119pi\u0144ski</option>
+<option value="kolski">kolski</option>
+<option value="koninski">koni\u0144ski</option>
+<option value="koscianski">ko\u015bcia\u0144ski</option>
+<option value="krotoszynski">krotoszy\u0144ski</option>
+<option value="leszczynski">leszczy\u0144ski</option>
+<option value="miedzychodzki">mi\u0119dzychodzki</option>
+<option value="nowotomyski">nowotomyski</option>
+<option value="obornicki">obornicki</option>
+<option value="ostrowski">ostrowski</option>
+<option value="ostrzeszowski">ostrzeszowski</option>
+<option value="pilski">pilski</option>
+<option value="pleszewski">pleszewski</option>
+<option value="poznanski">pozna\u0144ski</option>
+<option value="rawicki">rawicki</option>
+<option value="slupecki">s\u0142upecki</option>
+<option value="szamotulski">szamotulski</option>
+<option value="sredzki">\u015bredzki</option>
+<option value="sremski">\u015bremski</option>
+<option value="turecki">turecki</option>
+<option value="wagrowiecki">w\u0105growiecki</option>
+<option value="wolsztynski">wolszty\u0144ski</option>
+<option value="wrzesinski">wrzesi\u0144ski</option>
+<option value="zlotowski">z\u0142otowski</option>
+<option value="bialogardzki">bia\u0142ogardzki</option>
+<option value="choszczenski">choszcze\u0144ski</option>
+<option value="drawski">drawski</option>
+<option value="goleniowski">goleniowski</option>
+<option value="gryficki">gryficki</option>
+<option value="gryfinski">gryfi\u0144ski</option>
+<option value="kamienski">kamie\u0144ski</option>
+<option value="kolobrzeski">ko\u0142obrzeski</option>
+<option value="koszalinski">koszali\u0144ski</option>
+<option value="lobeski">\u0142obeski</option>
+<option value="mysliborski">my\u015bliborski</option>
+<option value="policki">policki</option>
+<option value="pyrzycki">pyrzycki</option>
+<option value="slawienski">s\u0142awie\u0144ski</option>
+<option value="stargardzki">stargardzki</option>
+<option value="szczecinecki">szczecinecki</option>
+<option value="swidwinski">\u015bwidwi\u0144ski</option>
+<option value="walecki">wa\u0142ecki</option>
+</select>'''
+        self.assertEqual(f.render('administrativeunit', 'katowice'), out)
+    
+    def test_PLPostalCodeField(self):
+        error_format = [u'Enter a postal code in the format XX-XXX.']
+        valid = {
+            '41-403': '41-403',
+        }
+        invalid = {
+            '43--434': error_format,
+        }
+        self.assertFieldOutput(PLPostalCodeField, valid, invalid)
+    
+    def test_PLNIPField(self):
+        error_format = [u'Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX.']
+        error_checksum = [u'Wrong checksum for the Tax Number (NIP).']
+        valid = {
+            '64-62-414-124': '6462414124',
+            '646-241-41-24': '6462414124',
+        }
+        invalid = {
+            '43-343-234-323': error_format,
+            '646-241-41-23': error_checksum,
+        }
+        self.assertFieldOutput(PLNIPField, valid, invalid)
+    
+    def test_PLPESELField(self):
+        error_checksum = [u'Wrong checksum for the National Identification Number.']
+        error_format = [u'National Identification Number consists of 11 digits.']
+        valid = {
+            '80071610614': '80071610614',
+        }
+        invalid = {
+            '80071610610': error_checksum,
+            '80': error_format,
+            '800716106AA': error_format,
+        }
+        self.assertFieldOutput(PLPESELField, valid, invalid)
+    
+    def test_PLREGONField(self):
+        error_checksum = [u'Wrong checksum for the National Business Register Number (REGON).']
+        error_format = [u'National Business Register Number (REGON) consists of 9 or 14 digits.']
+        valid = {
+            '12345678512347': '12345678512347',
+            '590096454': '590096454',
+        }
+        invalid = {
+            '123456784': error_checksum,
+            '12345678412342': error_checksum,
+            '590096453': error_checksum,
+            '590096': error_format,
+        }
+        self.assertFieldOutput(PLREGONField, valid, invalid)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/pt.py b/parts/django/tests/regressiontests/forms/localflavor/pt.py
new file mode 100644
index 0000000..b8d784a
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/pt.py
@@ -0,0 +1,32 @@
+from django.contrib.localflavor.pt.forms import PTZipCodeField, PTPhoneNumberField
+
+from utils import LocalFlavorTestCase
+
+
+class PTLocalFlavorTests(LocalFlavorTestCase):
+    def test_PTZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXX-XXX.']
+        valid = {
+            '3030-034': '3030-034',
+            '1003456': '1003-456',
+        }
+        invalid = {
+            '2A200': error_format,
+            '980001': error_format,
+        }
+        self.assertFieldOutput(PTZipCodeField, valid, invalid)
+
+    def test_PTPhoneNumberField(self):
+        error_format = [u'Phone numbers must have 9 digits, or start by + or 00.']
+        valid = {
+            '917845189': '917845189',
+            '91 784 5189': '917845189',
+            '91 784 5189': '917845189',
+            '+351 91 111': '+35191111',
+            '00351873': '00351873',
+        }
+        invalid = {
+            '91 784 51 8': error_format,
+            '091 456 987 1': error_format,
+        }
+        self.assertFieldOutput(PTPhoneNumberField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/ro.py b/parts/django/tests/regressiontests/forms/localflavor/ro.py
new file mode 100644
index 0000000..c3dd403
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/ro.py
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+from django.contrib.localflavor.ro.forms import (ROCIFField, ROCNPField,
+    ROCountyField, ROCountySelect, ROIBANField, ROPhoneNumberField,
+    ROPostalCodeField)
+
+from utils import LocalFlavorTestCase
+
+
+class ROLocalFlavorTests(LocalFlavorTestCase):
+    def test_ROCountySelect(self):
+        f = ROCountySelect()
+        out = u'''<select name="county">
+<option value="AB">Alba</option>
+<option value="AR">Arad</option>
+<option value="AG">Arge\u015f</option>
+<option value="BC">Bac\u0103u</option>
+<option value="BH">Bihor</option>
+<option value="BN">Bistri\u0163a-N\u0103s\u0103ud</option>
+<option value="BT">Boto\u015fani</option>
+<option value="BV">Bra\u015fov</option>
+<option value="BR">Br\u0103ila</option>
+<option value="B">Bucure\u015fti</option>
+<option value="BZ">Buz\u0103u</option>
+<option value="CS">Cara\u015f-Severin</option>
+<option value="CL">C\u0103l\u0103ra\u015fi</option>
+<option value="CJ" selected="selected">Cluj</option>
+<option value="CT">Constan\u0163a</option>
+<option value="CV">Covasna</option>
+<option value="DB">D\xe2mbovi\u0163a</option>
+<option value="DJ">Dolj</option>
+<option value="GL">Gala\u0163i</option>
+<option value="GR">Giurgiu</option>
+<option value="GJ">Gorj</option>
+<option value="HR">Harghita</option>
+<option value="HD">Hunedoara</option>
+<option value="IL">Ialomi\u0163a</option>
+<option value="IS">Ia\u015fi</option>
+<option value="IF">Ilfov</option>
+<option value="MM">Maramure\u015f</option>
+<option value="MH">Mehedin\u0163i</option>
+<option value="MS">Mure\u015f</option>
+<option value="NT">Neam\u0163</option>
+<option value="OT">Olt</option>
+<option value="PH">Prahova</option>
+<option value="SM">Satu Mare</option>
+<option value="SJ">S\u0103laj</option>
+<option value="SB">Sibiu</option>
+<option value="SV">Suceava</option>
+<option value="TR">Teleorman</option>
+<option value="TM">Timi\u015f</option>
+<option value="TL">Tulcea</option>
+<option value="VS">Vaslui</option>
+<option value="VL">V\xe2lcea</option>
+<option value="VN">Vrancea</option>
+</select>'''
+        self.assertEqual(f.render('county', 'CJ'), out)
+
+    def test_ROCIFField(self):
+        error_invalid = [u'Enter a valid CIF.']
+        error_atmost = [u'Ensure this value has at most 10 characters (it has 11).']
+        error_atleast = [u'Ensure this value has at least 2 characters (it has 1).']
+        valid = {
+            '21694681': u'21694681',
+            'RO21694681': u'21694681',
+        }
+        invalid = {
+            '21694680': error_invalid,
+            '21694680000': error_atmost,
+            '0': error_atleast + error_invalid,
+        }
+        self.assertFieldOutput(ROCIFField, valid, invalid)
+
+    def test_ROCNPField(self):
+        error_invalid = [u'Enter a valid CNP.']
+        error_atleast = [u'Ensure this value has at least 13 characters (it has 10).']
+        error_atmost = [u'Ensure this value has at most 13 characters (it has 14).']
+        valid = {
+            '1981211204489': '1981211204489',
+        }
+        invalid = {
+            '1981211204487': error_invalid,
+            '1981232204489': error_invalid,
+            '9981211204489': error_invalid,
+            '9981211209': error_atleast + error_invalid,
+            '19812112044891': error_atmost,
+        }
+        self.assertFieldOutput(ROCNPField, valid, invalid)
+
+    def test_ROCountyField(self):
+        error_format = [u'Enter a Romanian county code or name.']
+        valid = {
+            'CJ': 'CJ',
+            'cj': 'CJ',
+            u'Argeş': 'AG',
+            u'argeş': 'AG',
+        }
+        invalid = {
+            'Arges': error_format,
+        }
+        self.assertFieldOutput(ROCountyField, valid, invalid)
+
+    def test_ROIBANField(self):
+        error_invalid = [u'Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format']
+        error_atleast = [u'Ensure this value has at least 24 characters (it has 23).']
+        valid = {
+            'RO56RZBR0000060003291177': 'RO56RZBR0000060003291177',
+            'RO56-RZBR-0000-0600-0329-1177': 'RO56RZBR0000060003291177',
+        }
+        invalid = {
+            'RO56RZBR0000060003291176': error_invalid,
+            'AT61 1904 3002 3457 3201': error_invalid,
+            'RO56RZBR000006000329117': error_atleast + error_invalid,
+        }
+        self.assertFieldOutput(ROIBANField, valid, invalid)
+
+    def test_ROPhoneNumberField(self):
+        error_format = [u'Phone numbers must be in XXXX-XXXXXX format.']
+        error_atleast = [u'Ensure this value has at least 10 characters (it has 9).']
+        valid = {
+            '0264485936': '0264485936',
+            '(0264)-485936': '0264485936',
+        }
+        invalid = {
+            '02644859368': error_format,
+            '026448593': error_atleast + error_format
+            ,
+        }
+        self.assertFieldOutput(ROPhoneNumberField, valid, invalid)
+
+    def test_ROPostalCodeField(self):
+        error_atleast = [u'Ensure this value has at least 6 characters (it has 5).']
+        error_atmost = [u'Ensure this value has at most 6 characters (it has 7).']
+        error_invalid = [u'Enter a valid postal code in the format XXXXXX']
+
+        valid = {
+            '400473': '400473',
+        }
+        invalid = {
+            '40047': error_atleast + error_invalid,
+            '4004731': error_atmost + error_invalid,
+        }
+        self.assertFieldOutput(ROPostalCodeField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/se.py b/parts/django/tests/regressiontests/forms/localflavor/se.py
new file mode 100644
index 0000000..316a612
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/se.py
@@ -0,0 +1,331 @@
+# -*- coding: utf-8 -*-
+# Tests for the contrib/localflavor/se form fields.
+
+tests = r"""
+# Monkey-patch datetime.date
+>>> import datetime
+>>> class MockDate(datetime.date):
+...     def today(cls):
+...         return datetime.date(2008, 5, 14)
+...     today = classmethod(today)
+...
+>>> olddate = datetime.date
+>>> datetime.date = MockDate
+>>> datetime.date.today() == olddate(2008, 5, 14)
+True
+
+# SECountySelect #####################################################
+>>> from django.contrib.localflavor.se.forms import SECountySelect
+
+>>> w = SECountySelect()
+>>> w.render('swedish_county', 'E')
+u'<select name="swedish_county">\n<option value="AB">Stockholm</option>\n<option value="AC">V\xe4sterbotten</option>\n<option value="BD">Norrbotten</option>\n<option value="C">Uppsala</option>\n<option value="D">S\xf6dermanland</option>\n<option value="E" selected="selected">\xd6sterg\xf6tland</option>\n<option value="F">J\xf6nk\xf6ping</option>\n<option value="G">Kronoberg</option>\n<option value="H">Kalmar</option>\n<option value="I">Gotland</option>\n<option value="K">Blekinge</option>\n<option value="M">Sk\xe5ne</option>\n<option value="N">Halland</option>\n<option value="O">V\xe4stra G\xf6taland</option>\n<option value="S">V\xe4rmland</option>\n<option value="T">\xd6rebro</option>\n<option value="U">V\xe4stmanland</option>\n<option value="W">Dalarna</option>\n<option value="X">G\xe4vleborg</option>\n<option value="Y">V\xe4sternorrland</option>\n<option value="Z">J\xe4mtland</option>\n</select>'
+
+# SEOrganisationNumberField #######################################
+
+>>> from django.contrib.localflavor.se.forms import SEOrganisationNumberField
+
+>>> f = SEOrganisationNumberField()
+
+# Ordinary personal identity numbers for sole proprietors
+# The same rules as for SEPersonalIdentityField applies here
+>>> f.clean('870512-1989')
+u'198705121989'
+>>> f.clean('19870512-1989')
+u'198705121989'
+>>> f.clean('870512-2128')
+u'198705122128'
+>>> f.clean('081015-6315')
+u'190810156315'
+>>> f.clean('081015+6315')
+u'180810156315'
+>>> f.clean('0810156315')
+u'190810156315'
+
+>>> f.clean('081015 6315')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+>>> f.clean('950231-4496')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+>>> f.clean('6914104499')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+>>> f.clean('950d314496')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+>>> f.clean('invalid!!!')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+>>> f.clean('870514-1111')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+
+
+# Empty values
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+# Co-ordination number checking
+# Co-ordination numbers are not valid organisation numbers
+>>> f.clean('870574-1315')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+
+>>> f.clean('870573-1311')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+
+# Test some different organisation numbers
+>>> f.clean('556074-7569') # IKEA Linköping
+u'5560747569'
+
+>>> f.clean('556074-3089') # Volvo Personvagnar
+u'5560743089'
+
+>>> f.clean('822001-5476') # LJS (organisation)
+u'8220015476'
+
+>>> f.clean('8220015476') # LJS (organisation)
+u'8220015476'
+
+>>> f.clean('2120000449') # Katedralskolan Linköping (school)
+u'2120000449'
+
+# Faux organisation number, which tests that the checksum can be 0
+>>> f.clean('232518-5060')
+u'2325185060'
+
+>>> f.clean('556074+3089') # Volvo Personvagnar, bad format
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+
+
+# Invalid checksum
+>>> f.clean('2120000441')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+
+# Valid checksum but invalid organisation type
+f.clean('1120000441')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish organisation number.']
+
+# Empty values with required=False
+>>> f = SEOrganisationNumberField(required=False)
+
+>>> f.clean(None)
+u''
+
+>>> f.clean('')
+u''
+
+
+# SEPersonalIdentityNumberField #######################################
+
+>>> from django.contrib.localflavor.se.forms import SEPersonalIdentityNumberField
+
+>>> f = SEPersonalIdentityNumberField()
+
+# Valid id numbers
+>>> f.clean('870512-1989')
+u'198705121989'
+
+>>> f.clean('870512-2128')
+u'198705122128'
+
+>>> f.clean('19870512-1989')
+u'198705121989'
+
+>>> f.clean('198705121989')
+u'198705121989'
+
+>>> f.clean('081015-6315')
+u'190810156315'
+
+>>> f.clean('0810156315')
+u'190810156315'
+
+# This is a "special-case" in the checksum calculation,
+# where the sum is divisible by 10 (the checksum digit == 0)
+>>> f.clean('8705141060')
+u'198705141060'
+
+# + means that the person is older than 100 years
+>>> f.clean('081015+6315')
+u'180810156315'
+
+# Bogus values
+>>> f.clean('081015 6315')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+>>> f.clean('950d314496')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+>>> f.clean('invalid!!!')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+
+# Invalid dates
+
+# February 31st does not exist
+>>> f.clean('950231-4496')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+# Month 14 does not exist
+>>> f.clean('6914104499')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+# There are no Swedish personal id numbers where year < 1800
+>>> f.clean('17430309-7135')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+# Invalid checksum
+>>> f.clean('870514-1111')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+# Empty values
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+# Co-ordination number checking
+>>> f.clean('870574-1315')
+u'198705741315'
+
+>>> f.clean('870574+1315')
+u'188705741315'
+
+>>> f.clean('198705741315')
+u'198705741315'
+
+# Co-ordination number with bad checksum
+>>> f.clean('870573-1311')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+
+# Check valid co-ordination numbers, that should not be accepted
+# because of coordination_number=False
+>>> f = SEPersonalIdentityNumberField(coordination_number=False)
+
+>>> f.clean('870574-1315')
+Traceback (most recent call last):
+...
+ValidationError: [u'Co-ordination numbers are not allowed.']
+
+>>> f.clean('870574+1315')
+Traceback (most recent call last):
+...
+ValidationError: [u'Co-ordination numbers are not allowed.']
+
+>>> f.clean('8705741315')
+Traceback (most recent call last):
+...
+ValidationError: [u'Co-ordination numbers are not allowed.']
+
+# Invalid co-ordination numbers should be treated as invalid, and not
+# as co-ordination numbers
+>>> f.clean('870573-1311')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swedish personal identity number.']
+
+# Empty values with required=False
+>>> f = SEPersonalIdentityNumberField(required=False)
+
+>>> f.clean(None)
+u''
+
+>>> f.clean('')
+u''
+
+# SEPostalCodeField ###############################################
+>>> from django.contrib.localflavor.se.forms import SEPostalCodeField
+>>> f = SEPostalCodeField()
+>>>
+Postal codes can have spaces
+>>> f.clean('589 37')
+u'58937'
+
+... but the dont have to
+>>> f.clean('58937')
+u'58937'
+>>> f.clean('abcasfassadf')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a Swedish postal code in the format XXXXX.']
+
+# Only one space is allowed for separation
+>>> f.clean('589  37')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a Swedish postal code in the format XXXXX.']
+
+# The postal code must not start with 0
+>>> f.clean('01234')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a Swedish postal code in the format XXXXX.']
+
+# Empty values
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+# Empty values, required=False
+>>> f = SEPostalCodeField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean(None)
+u''
+
+# Revert the monkey patching
+>>> datetime.date = olddate
+
+"""
diff --git a/parts/django/tests/regressiontests/forms/localflavor/sk.py b/parts/django/tests/regressiontests/forms/localflavor/sk.py
new file mode 100644
index 0000000..a5bed6f
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/sk.py
@@ -0,0 +1,116 @@
+from django.contrib.localflavor.sk.forms import (SKRegionSelect,
+    SKPostalCodeField, SKDistrictSelect)
+
+from utils import LocalFlavorTestCase
+
+
+class SKLocalFlavorTests(LocalFlavorTestCase):
+    def test_SKRegionSelect(self):
+        f = SKRegionSelect()
+        out = u'''<select name="regions">
+<option value="BB">Banska Bystrica region</option>
+<option value="BA">Bratislava region</option>
+<option value="KE">Kosice region</option>
+<option value="NR">Nitra region</option>
+<option value="PO">Presov region</option>
+<option value="TN">Trencin region</option>
+<option value="TT" selected="selected">Trnava region</option>
+<option value="ZA">Zilina region</option>
+</select>'''
+        self.assertEqual(f.render('regions', 'TT'), out)
+
+    def test_SKDistrictSelect(self):
+        f = SKDistrictSelect()
+        out = u'''<select name="Districts">
+<option value="BB">Banska Bystrica</option>
+<option value="BS">Banska Stiavnica</option>
+<option value="BJ">Bardejov</option>
+<option value="BN">Banovce nad Bebravou</option>
+<option value="BR">Brezno</option>
+<option value="BA1">Bratislava I</option>
+<option value="BA2">Bratislava II</option>
+<option value="BA3">Bratislava III</option>
+<option value="BA4">Bratislava IV</option>
+<option value="BA5">Bratislava V</option>
+<option value="BY">Bytca</option>
+<option value="CA">Cadca</option>
+<option value="DT">Detva</option>
+<option value="DK">Dolny Kubin</option>
+<option value="DS">Dunajska Streda</option>
+<option value="GA">Galanta</option>
+<option value="GL">Gelnica</option>
+<option value="HC">Hlohovec</option>
+<option value="HE">Humenne</option>
+<option value="IL">Ilava</option>
+<option value="KK">Kezmarok</option>
+<option value="KN">Komarno</option>
+<option value="KE1">Kosice I</option>
+<option value="KE2">Kosice II</option>
+<option value="KE3">Kosice III</option>
+<option value="KE4">Kosice IV</option>
+<option value="KEO">Kosice - okolie</option>
+<option value="KA">Krupina</option>
+<option value="KM">Kysucke Nove Mesto</option>
+<option value="LV">Levice</option>
+<option value="LE">Levoca</option>
+<option value="LM">Liptovsky Mikulas</option>
+<option value="LC">Lucenec</option>
+<option value="MA">Malacky</option>
+<option value="MT">Martin</option>
+<option value="ML">Medzilaborce</option>
+<option value="MI">Michalovce</option>
+<option value="MY">Myjava</option>
+<option value="NO">Namestovo</option>
+<option value="NR">Nitra</option>
+<option value="NM">Nove Mesto nad Vahom</option>
+<option value="NZ">Nove Zamky</option>
+<option value="PE">Partizanske</option>
+<option value="PK">Pezinok</option>
+<option value="PN">Piestany</option>
+<option value="PT">Poltar</option>
+<option value="PP">Poprad</option>
+<option value="PB">Povazska Bystrica</option>
+<option value="PO">Presov</option>
+<option value="PD">Prievidza</option>
+<option value="PU">Puchov</option>
+<option value="RA">Revuca</option>
+<option value="RS">Rimavska Sobota</option>
+<option value="RV">Roznava</option>
+<option value="RK" selected="selected">Ruzomberok</option>
+<option value="SB">Sabinov</option>
+<option value="SC">Senec</option>
+<option value="SE">Senica</option>
+<option value="SI">Skalica</option>
+<option value="SV">Snina</option>
+<option value="SO">Sobrance</option>
+<option value="SN">Spisska Nova Ves</option>
+<option value="SL">Stara Lubovna</option>
+<option value="SP">Stropkov</option>
+<option value="SK">Svidnik</option>
+<option value="SA">Sala</option>
+<option value="TO">Topolcany</option>
+<option value="TV">Trebisov</option>
+<option value="TN">Trencin</option>
+<option value="TT">Trnava</option>
+<option value="TR">Turcianske Teplice</option>
+<option value="TS">Tvrdosin</option>
+<option value="VK">Velky Krtis</option>
+<option value="VT">Vranov nad Toplou</option>
+<option value="ZM">Zlate Moravce</option>
+<option value="ZV">Zvolen</option>
+<option value="ZC">Zarnovica</option>
+<option value="ZH">Ziar nad Hronom</option>
+<option value="ZA">Zilina</option>
+</select>'''
+        self.assertEqual(f.render('Districts', 'RK'), out)
+
+    def test_SKPostalCodeField(self):
+        error_format = [u'Enter a postal code in the format XXXXX or XXX XX.']
+        valid = {
+            '91909': '91909',
+            '917 01': '91701',
+        }
+        invalid = {
+            '84545x': error_format,
+        }
+        self.assertFieldOutput(SKPostalCodeField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/uk.py b/parts/django/tests/regressiontests/forms/localflavor/uk.py
new file mode 100644
index 0000000..6fd536f
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/uk.py
@@ -0,0 +1,30 @@
+from django.contrib.localflavor.uk.forms import UKPostcodeField
+
+from utils import LocalFlavorTestCase
+
+
+class UKLocalFlavorTests(LocalFlavorTestCase):
+    def test_UKPostcodeField(self):
+        error_invalid = [u'Enter a valid postcode.']
+        valid = {
+            'BT32 4PX': 'BT32 4PX',
+            'GIR 0AA': 'GIR 0AA',
+            'BT324PX': 'BT32 4PX',
+            ' so11aa ': 'SO1 1AA',
+            ' so1  1aa ': 'SO1 1AA',
+            'G2 3wt': 'G2 3WT',
+            'EC1A 1BB': 'EC1A 1BB',
+            'Ec1a1BB': 'EC1A 1BB',
+        }
+        invalid = {
+            '1NV 4L1D': error_invalid,
+            '1NV4L1D': error_invalid,
+            ' b0gUS': error_invalid,
+        }
+        self.assertFieldOutput(UKPostcodeField, valid, invalid)
+        valid = {}
+        invalid = {
+            '1NV 4L1D': [u'Enter a bloody postcode!'],
+        }
+        kwargs = {'error_messages': {'invalid': 'Enter a bloody postcode!'}}
+        self.assertFieldOutput(UKPostcodeField, valid, invalid, field_kwargs=kwargs)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/us.py b/parts/django/tests/regressiontests/forms/localflavor/us.py
new file mode 100644
index 0000000..65dd1bb
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/us.py
@@ -0,0 +1,126 @@
+from django.contrib.localflavor.us.forms import (USZipCodeField,
+    USPhoneNumberField, USStateField, USStateSelect, USSocialSecurityNumberField)
+
+from utils import LocalFlavorTestCase
+
+
+class USLocalFlavorTests(LocalFlavorTestCase):
+    def test_USStateSelect(self):
+        f = USStateSelect()
+        out = u'''<select name="state">
+<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">Georgia</option>
+<option value="GU">Guam</option>
+<option value="HI">Hawaii</option>
+<option value="ID">Idaho</option>
+<option value="IL" selected="selected">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.assertEquals(f.render('state', 'IL'), out)
+
+    def test_USZipCodeField(self):
+        error_format = [u'Enter a zip code in the format XXXXX or XXXXX-XXXX.']
+        valid = {
+            '60606': '60606',
+            60606: '60606',
+            '04000': '04000',
+            '60606-1234': '60606-1234',
+        }
+        invalid = {
+            '4000': error_format,
+            '6060-1234': error_format,
+            '60606-': error_format,
+        }
+        self.assertFieldOutput(USZipCodeField, valid, invalid)
+
+    def test_USPhoneNumberField(self):
+        error_format = [u'Phone numbers must be in XXX-XXX-XXXX format.']
+        valid = {
+            '312-555-1212': '312-555-1212',
+            '3125551212': '312-555-1212',
+            '312 555-1212': '312-555-1212',
+            '(312) 555-1212': '312-555-1212',
+            '312 555 1212': '312-555-1212',
+            '312.555.1212': '312-555-1212',
+            '312.555-1212': '312-555-1212',
+            ' (312) 555.1212 ': '312-555-1212',
+        }
+        invalid = {
+            '555-1212': error_format,
+            '312-55-1212': error_format,
+        }
+        self.assertFieldOutput(USPhoneNumberField, valid, invalid)
+
+    def test_USStateField(self):
+        error_invalid = [u'Enter a U.S. state or territory.']
+        valid = {
+            'il': 'IL',
+            'IL': 'IL',
+            'illinois': 'IL',
+            '  illinois ': 'IL',
+        }
+        invalid = {
+            60606: error_invalid,
+        }
+        self.assertFieldOutput(USStateField, valid, invalid)
+
+    def test_USSocialSecurityNumberField(self):
+        error_invalid = [u'Enter a valid U.S. Social Security number in XXX-XX-XXXX format.']
+
+        valid = {
+            '987-65-4330': '987-65-4330',
+            '987654330': '987-65-4330',
+        }
+        invalid = {
+            '078-05-1120': error_invalid,
+        }
+        self.assertFieldOutput(USSocialSecurityNumberField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/utils.py b/parts/django/tests/regressiontests/forms/localflavor/utils.py
new file mode 100644
index 0000000..a10258f
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/utils.py
@@ -0,0 +1,51 @@
+from unittest import TestCase
+
+from django.core.exceptions import ValidationError
+from django.core.validators import EMPTY_VALUES
+
+
+class LocalFlavorTestCase(TestCase):
+    def assertFieldOutput(self, fieldclass, valid, invalid, field_args=[],
+        field_kwargs={}, empty_value=u''):
+        """Asserts that a field behaves correctly with various inputs.
+
+        Args:
+            fieldclass: the class of the field to be tested.
+            valid: a dictionary mapping valid inputs to their expected
+                    cleaned values.
+            invalid: a dictionary mapping invalid inputs to one or more
+                    raised error messages.
+            fieldargs: the args passed to instantiate the field
+            fieldkwargs: the kwargs passed to instantiate the field
+            emptyvalue: the expected clean output for inputs in EMPTY_VALUES
+        """
+        required = fieldclass(*field_args, **field_kwargs)
+        optional = fieldclass(*field_args, **dict(field_kwargs, required=False))
+        # test valid inputs
+        for input, output in valid.items():
+            self.assertEqual(required.clean(input), output)
+            self.assertEqual(optional.clean(input), output)
+        # test invalid inputs
+        for input, errors in invalid.items():
+            try:
+                required.clean(input)
+            except ValidationError, e:
+                self.assertEqual(errors, e.messages)
+            else:
+                self.fail()
+            try:
+                optional.clean(input)
+            except ValidationError, e:
+                self.assertEqual(errors, e.messages)
+            else:
+                self.fail()
+        # test required inputs
+        error_required = [u'This field is required.']
+        for val in EMPTY_VALUES:
+            try:
+                required.clean(val)
+            except ValidationError, e:
+                self.assertEqual(error_required, e.messages)
+            else:
+                self.fail()
+            self.assertEqual(optional.clean(val), empty_value)
diff --git a/parts/django/tests/regressiontests/forms/localflavor/uy.py b/parts/django/tests/regressiontests/forms/localflavor/uy.py
new file mode 100644
index 0000000..2b9e134
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/uy.py
@@ -0,0 +1,52 @@
+from django.contrib.localflavor.uy.forms import UYDepartamentSelect, UYCIField
+from django.contrib.localflavor.uy.util import get_validation_digit
+
+from utils import LocalFlavorTestCase
+
+
+class UYLocalFlavorTests(LocalFlavorTestCase):
+    def test_UYDepartmentSelect(self):
+        f = UYDepartamentSelect()
+        out = u'''<select name="departamentos">
+<option value="G">Artigas</option>
+<option value="A">Canelones</option>
+<option value="E">Cerro Largo</option>
+<option value="L">Colonia</option>
+<option value="Q">Durazno</option>
+<option value="N">Flores</option>
+<option value="O">Florida</option>
+<option value="P">Lavalleja</option>
+<option value="B">Maldonado</option>
+<option value="S" selected="selected">Montevideo</option>
+<option value="I">Paysand\xfa</option>
+<option value="J">R\xedo Negro</option>
+<option value="F">Rivera</option>
+<option value="C">Rocha</option>
+<option value="H">Salto</option>
+<option value="M">San Jos\xe9</option>
+<option value="K">Soriano</option>
+<option value="R">Tacuaremb\xf3</option>
+<option value="D">Treinta y Tres</option>
+</select>'''
+        self.assertEqual(f.render('departamentos', 'S'), out)
+    
+    def test_UYCIField(self):
+        error_format = [u'Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format.']
+        error_invalid = [u'Enter a valid CI number.']
+        valid = {
+            '4098053': '4098053',
+            '409805-3': '409805-3',
+            '409.805-3': '409.805-3',
+            '10054112': '10054112',
+            '1005411-2': '1005411-2',
+            '1.005.411-2': '1.005.411-2',
+        }
+        invalid = {
+            'foo': [u'Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format.'],
+            '409805-2': [u'Enter a valid CI number.'],
+            '1.005.411-5': [u'Enter a valid CI number.'],
+        }
+        self.assertFieldOutput(UYCIField, valid, invalid)
+        self.assertEqual(get_validation_digit(409805), 3)
+        self.assertEqual(get_validation_digit(1005411), 2)
+
diff --git a/parts/django/tests/regressiontests/forms/localflavor/za.py b/parts/django/tests/regressiontests/forms/localflavor/za.py
new file mode 100644
index 0000000..c912421
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavor/za.py
@@ -0,0 +1,29 @@
+from django.contrib.localflavor.za.forms import ZAIDField, ZAPostCodeField
+
+from utils import LocalFlavorTestCase
+
+
+class ZALocalFlavorTests(LocalFlavorTestCase):
+    def test_ZAIDField(self):
+        error_invalid = [u'Enter a valid South African ID number']
+        valid = {
+            '0002290001003': '0002290001003',
+            '000229 0001 003': '0002290001003',
+        }
+        invalid = {
+            '0102290001001': error_invalid,
+            '811208': error_invalid,
+            '0002290001004': error_invalid,
+        }
+        self.assertFieldOutput(ZAIDField, valid, invalid)
+
+    def test_ZAPostCodeField(self):
+        error_invalid = [u'Enter a valid South African postal code']
+        valid = {
+            '0000': '0000',
+        }
+        invalid = {
+            'abcd': error_invalid,
+            ' 7530': error_invalid,
+        }
+        self.assertFieldOutput(ZAPostCodeField, valid, invalid)
diff --git a/parts/django/tests/regressiontests/forms/localflavortests.py b/parts/django/tests/regressiontests/forms/localflavortests.py
new file mode 100644
index 0000000..2582656
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/localflavortests.py
@@ -0,0 +1,37 @@
+from localflavor.cz import tests as localflavor_cz_tests
+from localflavor.se import tests as localflavor_se_tests
+
+from localflavor.ar import ARLocalFlavorTests
+from localflavor.at import ATLocalFlavorTests
+from localflavor.au import AULocalFlavorTests
+from localflavor.at import ATLocalFlavorTests
+from localflavor.br import BRLocalFlavorTests
+from localflavor.ca import CALocalFlavorTests
+from localflavor.ch import CHLocalFlavorTests
+from localflavor.cl import CLLocalFlavorTests
+from localflavor.de import DELocalFlavorTests
+from localflavor.es import ESLocalFlavorTests
+from localflavor.fi import FILocalFlavorTests
+from localflavor.fr import FRLocalFlavorTests
+from localflavor.generic import GenericLocalFlavorTests
+from localflavor.id import IDLocalFlavorTests
+from localflavor.ie import IELocalFlavorTests
+from localflavor.is_ import ISLocalFlavorTests
+from localflavor.it import ITLocalFlavorTests
+from localflavor.jp import JPLocalFlavorTests
+from localflavor.kw import KWLocalFlavorTests
+from localflavor.nl import NLLocalFlavorTests
+from localflavor.pl import PLLocalFlavorTests
+from localflavor.pt import PTLocalFlavorTests
+from localflavor.ro import ROLocalFlavorTests
+from localflavor.sk import SKLocalFlavorTests
+from localflavor.uk import UKLocalFlavorTests
+from localflavor.us import USLocalFlavorTests
+from localflavor.uy import UYLocalFlavorTests
+from localflavor.za import ZALocalFlavorTests
+
+
+__test__ = {
+    'localflavor_cz_tests': localflavor_cz_tests,
+    'localflavor_se_tests': localflavor_se_tests,
+}
diff --git a/parts/django/tests/regressiontests/forms/models.py b/parts/django/tests/regressiontests/forms/models.py
new file mode 100644
index 0000000..203980c
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/models.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+import datetime
+import tempfile
+
+from django.db import models
+from django.core.files.storage import FileSystemStorage
+
+
+temp_storage_location = tempfile.mkdtemp()
+temp_storage = FileSystemStorage(location=temp_storage_location)
+
+
+class BoundaryModel(models.Model):
+    positive_integer = models.PositiveIntegerField(null=True, blank=True)
+
+
+callable_default_value = 0
+def callable_default():
+    global callable_default_value
+    callable_default_value = callable_default_value + 1
+    return callable_default_value
+
+
+class Defaults(models.Model):
+    name = models.CharField(max_length=255, default='class default value')
+    def_date = models.DateField(default = datetime.date(1980, 1, 1))
+    value = models.IntegerField(default=42)
+    callable_default = models.IntegerField(default=callable_default)
+
+
+class ChoiceModel(models.Model):
+    """For ModelChoiceField and ModelMultipleChoiceField tests."""
+    name = models.CharField(max_length=10)
+
+
+class ChoiceOptionModel(models.Model):
+    """Destination for ChoiceFieldModel's ForeignKey.
+    Can't reuse ChoiceModel because error_message tests require that it have no instances."""
+    name = models.CharField(max_length=10)
+
+    class Meta:
+        ordering = ('name',)
+
+    def __unicode__(self):
+        return u'ChoiceOption %d' % self.pk
+
+
+class ChoiceFieldModel(models.Model):
+    """Model with ForeignKey to another model, for testing ModelForm
+    generation with ModelChoiceField."""
+    choice = models.ForeignKey(ChoiceOptionModel, blank=False,
+                               default=lambda: ChoiceOptionModel.objects.get(name='default'))
+    choice_int = models.ForeignKey(ChoiceOptionModel, blank=False, related_name='choice_int',
+                                   default=lambda: 1)
+
+    multi_choice = models.ManyToManyField(ChoiceOptionModel, blank=False, related_name='multi_choice',
+                                          default=lambda: ChoiceOptionModel.objects.filter(name='default'))
+    multi_choice_int = models.ManyToManyField(ChoiceOptionModel, blank=False, related_name='multi_choice_int',
+                                              default=lambda: [1])
+
+
+class FileModel(models.Model):
+    file = models.FileField(storage=temp_storage, upload_to='tests')
+
+
+class Group(models.Model):
+    name = models.CharField(max_length=10)
+
+    def __unicode__(self):
+        return u'%s' % self.name
+
+
+class Cheese(models.Model):
+   name = models.CharField(max_length=100)
diff --git a/parts/django/tests/regressiontests/forms/tests/__init__.py b/parts/django/tests/regressiontests/forms/tests/__init__.py
new file mode 100644
index 0000000..95df6a1
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/__init__.py
@@ -0,0 +1,43 @@
+from error_messages import *
+from extra import *
+from fields import FieldsTests
+from forms import *
+from formsets import *
+from input_formats import *
+from media import *
+from models import *
+from regressions import *
+from util import *
+from validators import TestFieldWithValidators
+from widgets import *
+
+from regressiontests.forms.localflavortests import (
+    __test__,
+    ARLocalFlavorTests,
+    ATLocalFlavorTests,
+    AULocalFlavorTests,
+    BRLocalFlavorTests,
+    CALocalFlavorTests,
+    CHLocalFlavorTests,
+    CLLocalFlavorTests,
+    DELocalFlavorTests,
+    ESLocalFlavorTests,
+    FILocalFlavorTests,
+    FRLocalFlavorTests,
+    GenericLocalFlavorTests,
+    IDLocalFlavorTests,
+    IELocalFlavorTests,
+    ISLocalFlavorTests,
+    ITLocalFlavorTests,
+    JPLocalFlavorTests,
+    KWLocalFlavorTests,
+    NLLocalFlavorTests,
+    PLLocalFlavorTests,
+    PTLocalFlavorTests,
+    ROLocalFlavorTests,
+    SKLocalFlavorTests,
+    UKLocalFlavorTests,
+    USLocalFlavorTests,
+    UYLocalFlavorTests,
+    ZALocalFlavorTests,
+)
diff --git a/parts/django/tests/regressiontests/forms/tests/error_messages.py b/parts/django/tests/regressiontests/forms/tests/error_messages.py
new file mode 100644
index 0000000..39d88a6
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/error_messages.py
@@ -0,0 +1,253 @@
+# -*- coding: utf-8 -*-
+import unittest
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.forms import *
+from django.test import TestCase
+from django.utils.safestring import mark_safe
+
+class AssertFormErrorsMixin(object):
+    def assertFormErrors(self, expected, the_callable, *args, **kwargs):
+        try:
+            the_callable(*args, **kwargs)
+            self.fail("Testing the 'clean' method on %s failed to raise a ValidationError.")
+        except ValidationError, e:
+            self.assertEqual(e.messages, expected)
+
+
+class FormsErrorMessagesTestCase(unittest.TestCase, AssertFormErrorsMixin):
+    def test_charfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'min_length': 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s',
+            'max_length': 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s',
+        }
+        f = CharField(min_length=5, max_length=10, error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'LENGTH 4, MIN LENGTH 5'], f.clean, '1234')
+        self.assertFormErrors([u'LENGTH 11, MAX LENGTH 10'], f.clean, '12345678901')
+
+    def test_integerfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+            'min_value': 'MIN VALUE IS %(limit_value)s',
+            'max_value': 'MAX VALUE IS %(limit_value)s',
+        }
+        f = IntegerField(min_value=5, max_value=10, error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc')
+        self.assertFormErrors([u'MIN VALUE IS 5'], f.clean, '4')
+        self.assertFormErrors([u'MAX VALUE IS 10'], f.clean, '11')
+
+    def test_floatfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+            'min_value': 'MIN VALUE IS %(limit_value)s',
+            'max_value': 'MAX VALUE IS %(limit_value)s',
+        }
+        f = FloatField(min_value=5, max_value=10, error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc')
+        self.assertFormErrors([u'MIN VALUE IS 5'], f.clean, '4')
+        self.assertFormErrors([u'MAX VALUE IS 10'], f.clean, '11')
+
+    def test_decimalfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+            'min_value': 'MIN VALUE IS %(limit_value)s',
+            'max_value': 'MAX VALUE IS %(limit_value)s',
+            'max_digits': 'MAX DIGITS IS %s',
+            'max_decimal_places': 'MAX DP IS %s',
+            'max_whole_digits': 'MAX DIGITS BEFORE DP IS %s',
+        }
+        f = DecimalField(min_value=5, max_value=10, error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc')
+        self.assertFormErrors([u'MIN VALUE IS 5'], f.clean, '4')
+        self.assertFormErrors([u'MAX VALUE IS 10'], f.clean, '11')
+
+        f2 = DecimalField(max_digits=4, decimal_places=2, error_messages=e)
+        self.assertFormErrors([u'MAX DIGITS IS 4'], f2.clean, '123.45')
+        self.assertFormErrors([u'MAX DP IS 2'], f2.clean, '1.234')
+        self.assertFormErrors([u'MAX DIGITS BEFORE DP IS 2'], f2.clean, '123.4')
+
+    def test_datefield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+        }
+        f = DateField(error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc')
+
+    def test_timefield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+        }
+        f = TimeField(error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc')
+
+    def test_datetimefield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+        }
+        f = DateTimeField(error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc')
+
+    def test_regexfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+            'min_length': 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s',
+            'max_length': 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s',
+        }
+        f = RegexField(r'^\d+$', min_length=5, max_length=10, error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abcde')
+        self.assertFormErrors([u'LENGTH 4, MIN LENGTH 5'], f.clean, '1234')
+        self.assertFormErrors([u'LENGTH 11, MAX LENGTH 10'], f.clean, '12345678901')
+
+    def test_emailfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+            'min_length': 'LENGTH %(show_value)s, MIN LENGTH %(limit_value)s',
+            'max_length': 'LENGTH %(show_value)s, MAX LENGTH %(limit_value)s',
+        }
+        f = EmailField(min_length=8, max_length=10, error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abcdefgh')
+        self.assertFormErrors([u'LENGTH 7, MIN LENGTH 8'], f.clean, 'a@b.com')
+        self.assertFormErrors([u'LENGTH 11, MAX LENGTH 10'], f.clean, 'aye@bee.com')
+
+    def test_filefield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+            'missing': 'MISSING',
+            'empty': 'EMPTY FILE',
+        }
+        f = FileField(error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc')
+        self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', None))
+        self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', ''))
+
+    def test_urlfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID',
+            'invalid_link': 'INVALID LINK',
+        }
+        f = URLField(verify_exists=True, error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID'], f.clean, 'abc.c')
+        self.assertFormErrors([u'INVALID LINK'], f.clean, 'http://www.broken.djangoproject.com')
+
+    def test_booleanfield(self):
+        e = {
+            'required': 'REQUIRED',
+        }
+        f = BooleanField(error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+
+    def test_choicefield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid_choice': '%(value)s IS INVALID CHOICE',
+        }
+        f = ChoiceField(choices=[('a', 'aye')], error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'b IS INVALID CHOICE'], f.clean, 'b')
+
+    def test_multiplechoicefield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid_choice': '%(value)s IS INVALID CHOICE',
+            'invalid_list': 'NOT A LIST',
+        }
+        f = MultipleChoiceField(choices=[('a', 'aye')], error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'NOT A LIST'], f.clean, 'b')
+        self.assertFormErrors([u'b IS INVALID CHOICE'], f.clean, ['b'])
+
+    def test_splitdatetimefield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid_date': 'INVALID DATE',
+            'invalid_time': 'INVALID TIME',
+        }
+        f = SplitDateTimeField(error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID DATE', u'INVALID TIME'], f.clean, ['a', 'b'])
+
+    def test_ipaddressfield(self):
+        e = {
+            'required': 'REQUIRED',
+            'invalid': 'INVALID IP ADDRESS',
+        }
+        f = IPAddressField(error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID IP ADDRESS'], f.clean, '127.0.0')
+
+    def test_subclassing_errorlist(self):
+        class TestForm(Form):
+            first_name = CharField()
+            last_name = CharField()
+            birthday = DateField()
+
+            def clean(self):
+                raise ValidationError("I like to be awkward.")
+
+        class CustomErrorList(util.ErrorList):
+            def __unicode__(self):
+                return self.as_divs()
+
+            def as_divs(self):
+                if not self: return u''
+                return mark_safe(u'<div class="error">%s</div>' % ''.join([u'<p>%s</p>' % e for e in self]))
+
+        # This form should print errors the default way.
+        form1 = TestForm({'first_name': 'John'})
+        self.assertEqual(str(form1['last_name'].errors), '<ul class="errorlist"><li>This field is required.</li></ul>')
+        self.assertEqual(str(form1.errors['__all__']), '<ul class="errorlist"><li>I like to be awkward.</li></ul>')
+
+        # This one should wrap error groups in the customized way.
+        form2 = TestForm({'first_name': 'John'}, error_class=CustomErrorList)
+        self.assertEqual(str(form2['last_name'].errors), '<div class="error"><p>This field is required.</p></div>')
+        self.assertEqual(str(form2.errors['__all__']), '<div class="error"><p>I like to be awkward.</p></div>')
+
+
+class ModelChoiceFieldErrorMessagesTestCase(TestCase, AssertFormErrorsMixin):
+    def test_modelchoicefield(self):
+        # Create choices for the model choice field tests below.
+        from regressiontests.forms.models import ChoiceModel
+        c1 = ChoiceModel.objects.create(pk=1, name='a')
+        c2 = ChoiceModel.objects.create(pk=2, name='b')
+        c3 = ChoiceModel.objects.create(pk=3, name='c')
+
+        # ModelChoiceField
+        e = {
+            'required': 'REQUIRED',
+            'invalid_choice': 'INVALID CHOICE',
+        }
+        f = ModelChoiceField(queryset=ChoiceModel.objects.all(), error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'INVALID CHOICE'], f.clean, '4')
+
+        # ModelMultipleChoiceField
+        e = {
+            'required': 'REQUIRED',
+            'invalid_choice': '%s IS INVALID CHOICE',
+            'list': 'NOT A LIST OF VALUES',
+        }
+        f = ModelMultipleChoiceField(queryset=ChoiceModel.objects.all(), error_messages=e)
+        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+        self.assertFormErrors([u'NOT A LIST OF VALUES'], f.clean, '3')
+        self.assertFormErrors([u'4 IS INVALID CHOICE'], f.clean, ['4'])
diff --git a/parts/django/tests/regressiontests/forms/tests/extra.py b/parts/django/tests/regressiontests/forms/tests/extra.py
new file mode 100644
index 0000000..bcdf4dd
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/extra.py
@@ -0,0 +1,610 @@
+# -*- coding: utf-8 -*-
+import datetime
+from decimal import Decimal
+import re
+import time
+import unittest
+from django.conf import settings
+from django.forms import *
+from django.forms.extras import SelectDateWidget
+from django.forms.util import ErrorList
+from django.test import TestCase
+from django.utils import translation
+from django.utils.encoding import force_unicode
+from django.utils.encoding import smart_unicode
+from error_messages import AssertFormErrorsMixin
+
+
+class FormsExtraTestCase(unittest.TestCase, AssertFormErrorsMixin):
+    ###############
+    # Extra stuff #
+    ###############
+
+    # The forms library comes with some extra, higher-level Field and Widget
+    def test_selectdate(self):
+        w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016'))
+        self.assertEqual(w.render('mydate', ''), """<select name="mydate_month" id="id_mydate_month">
+<option value="0">---</option>
+<option value="1">January</option>
+<option value="2">February</option>
+<option value="3">March</option>
+<option value="4">April</option>
+<option value="5">May</option>
+<option value="6">June</option>
+<option value="7">July</option>
+<option value="8">August</option>
+<option value="9">September</option>
+<option value="10">October</option>
+<option value="11">November</option>
+<option value="12">December</option>
+</select>
+<select name="mydate_day" id="id_mydate_day">
+<option value="0">---</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+<select name="mydate_year" id="id_mydate_year">
+<option value="0">---</option>
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010">2010</option>
+<option value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>""")
+        self.assertEqual(w.render('mydate', None), w.render('mydate', ''))
+
+        self.assertEqual(w.render('mydate', '2010-04-15'), """<select name="mydate_month" id="id_mydate_month">
+<option value="1">January</option>
+<option value="2">February</option>
+<option value="3">March</option>
+<option value="4" selected="selected">April</option>
+<option value="5">May</option>
+<option value="6">June</option>
+<option value="7">July</option>
+<option value="8">August</option>
+<option value="9">September</option>
+<option value="10">October</option>
+<option value="11">November</option>
+<option value="12">December</option>
+</select>
+<select name="mydate_day" id="id_mydate_day">
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15" selected="selected">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+<select name="mydate_year" id="id_mydate_year">
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010" selected="selected">2010</option>
+<option value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>""")
+
+        # Accepts a datetime or a string:
+        self.assertEqual(w.render('mydate', datetime.date(2010, 4, 15)), w.render('mydate', '2010-04-15'))
+
+        # Invalid dates still render the failed date:
+        self.assertEqual(w.render('mydate', '2010-02-31'), """<select name="mydate_month" id="id_mydate_month">
+<option value="1">January</option>
+<option value="2" selected="selected">February</option>
+<option value="3">March</option>
+<option value="4">April</option>
+<option value="5">May</option>
+<option value="6">June</option>
+<option value="7">July</option>
+<option value="8">August</option>
+<option value="9">September</option>
+<option value="10">October</option>
+<option value="11">November</option>
+<option value="12">December</option>
+</select>
+<select name="mydate_day" id="id_mydate_day">
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31" selected="selected">31</option>
+</select>
+<select name="mydate_year" id="id_mydate_year">
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010" selected="selected">2010</option>
+<option value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>""")
+
+        # Using a SelectDateWidget in a form:
+        w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016'), required=False)
+        self.assertEqual(w.render('mydate', ''), """<select name="mydate_month" id="id_mydate_month">
+<option value="0">---</option>
+<option value="1">January</option>
+<option value="2">February</option>
+<option value="3">March</option>
+<option value="4">April</option>
+<option value="5">May</option>
+<option value="6">June</option>
+<option value="7">July</option>
+<option value="8">August</option>
+<option value="9">September</option>
+<option value="10">October</option>
+<option value="11">November</option>
+<option value="12">December</option>
+</select>
+<select name="mydate_day" id="id_mydate_day">
+<option value="0">---</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+<select name="mydate_year" id="id_mydate_year">
+<option value="0">---</option>
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010">2010</option>
+<option value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>""")
+        self.assertEqual(w.render('mydate', '2010-04-15'), """<select name="mydate_month" id="id_mydate_month">
+<option value="0">---</option>
+<option value="1">January</option>
+<option value="2">February</option>
+<option value="3">March</option>
+<option value="4" selected="selected">April</option>
+<option value="5">May</option>
+<option value="6">June</option>
+<option value="7">July</option>
+<option value="8">August</option>
+<option value="9">September</option>
+<option value="10">October</option>
+<option value="11">November</option>
+<option value="12">December</option>
+</select>
+<select name="mydate_day" id="id_mydate_day">
+<option value="0">---</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13">13</option>
+<option value="14">14</option>
+<option value="15" selected="selected">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+<select name="mydate_year" id="id_mydate_year">
+<option value="0">---</option>
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010" selected="selected">2010</option>
+<option value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>""")
+
+        class GetDate(Form):
+            mydate = DateField(widget=SelectDateWidget)
+
+        a = GetDate({'mydate_month':'4', 'mydate_day':'1', 'mydate_year':'2008'})
+        self.assertTrue(a.is_valid())
+        self.assertEqual(a.cleaned_data['mydate'], datetime.date(2008, 4, 1))
+
+        # As with any widget that implements get_value_from_datadict,
+        # we must be prepared to accept the input from the "as_hidden"
+        # rendering as well.
+
+        self.assertEqual(a['mydate'].as_hidden(), '<input type="hidden" name="mydate" value="2008-4-1" id="id_mydate" />')
+
+        b = GetDate({'mydate':'2008-4-1'})
+        self.assertTrue(b.is_valid())
+        self.assertEqual(b.cleaned_data['mydate'], datetime.date(2008, 4, 1))
+
+    def test_multiwidget(self):
+        # MultiWidget and MultiValueField #############################################
+        # MultiWidgets are widgets composed of other widgets. They are usually
+        # combined with MultiValueFields - a field that is composed of other fields.
+        # MulitWidgets can themselved be composed of other MultiWidgets.
+        # SplitDateTimeWidget is one example of a MultiWidget.
+
+        class ComplexMultiWidget(MultiWidget):
+            def __init__(self, attrs=None):
+                widgets = (
+                    TextInput(),
+                    SelectMultiple(choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))),
+                    SplitDateTimeWidget(),
+                )
+                super(ComplexMultiWidget, self).__init__(widgets, attrs)
+
+            def decompress(self, value):
+                if value:
+                    data = value.split(',')
+                    return [data[0], data[1], datetime.datetime(*time.strptime(data[2], "%Y-%m-%d %H:%M:%S")[0:6])]
+                return [None, None, None]
+
+            def format_output(self, rendered_widgets):
+                return u'\n'.join(rendered_widgets)
+
+        w = ComplexMultiWidget()
+        self.assertEqual(w.render('name', 'some text,JP,2007-04-25 06:24:00'), """<input type="text" name="name_0" value="some text" />
+<select multiple="multiple" name="name_1">
+<option value="J" selected="selected">John</option>
+<option value="P" selected="selected">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>
+<input type="text" name="name_2_0" value="2007-04-25" /><input type="text" name="name_2_1" value="06:24:00" />""")
+
+        class ComplexField(MultiValueField):
+            def __init__(self, required=True, widget=None, label=None, initial=None):
+                fields = (
+                    CharField(),
+                    MultipleChoiceField(choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))),
+                    SplitDateTimeField()
+                )
+                super(ComplexField, self).__init__(fields, required, widget, label, initial)
+
+            def compress(self, data_list):
+                if data_list:
+                    return '%s,%s,%s' % (data_list[0],''.join(data_list[1]),data_list[2])
+                return None
+
+        f = ComplexField(widget=w)
+        self.assertEqual(f.clean(['some text', ['J','P'], ['2007-04-25','6:24:00']]), u'some text,JP,2007-04-25 06:24:00')
+        self.assertFormErrors([u'Select a valid choice. X is not one of the available choices.'], f.clean, ['some text',['X'], ['2007-04-25','6:24:00']])
+
+        # If insufficient data is provided, None is substituted
+        self.assertFormErrors([u'This field is required.'], f.clean, ['some text',['JP']])
+
+        class ComplexFieldForm(Form):
+            field1 = ComplexField(widget=w)
+
+        f = ComplexFieldForm()
+        self.assertEqual(f.as_table(), """<tr><th><label for="id_field1_0">Field1:</label></th><td><input type="text" name="field1_0" id="id_field1_0" />
+<select multiple="multiple" name="field1_1" id="id_field1_1">
+<option value="J">John</option>
+<option value="P">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>
+<input type="text" name="field1_2_0" id="id_field1_2_0" /><input type="text" name="field1_2_1" id="id_field1_2_1" /></td></tr>""")
+
+        f = ComplexFieldForm({'field1_0':'some text','field1_1':['J','P'], 'field1_2_0':'2007-04-25', 'field1_2_1':'06:24:00'})
+        self.assertEqual(f.as_table(), """<tr><th><label for="id_field1_0">Field1:</label></th><td><input type="text" name="field1_0" value="some text" id="id_field1_0" />
+<select multiple="multiple" name="field1_1" id="id_field1_1">
+<option value="J" selected="selected">John</option>
+<option value="P" selected="selected">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>
+<input type="text" name="field1_2_0" value="2007-04-25" id="id_field1_2_0" /><input type="text" name="field1_2_1" value="06:24:00" id="id_field1_2_1" /></td></tr>""")
+
+        self.assertEqual(f.cleaned_data['field1'], u'some text,JP,2007-04-25 06:24:00')
+
+    def test_ipaddress(self):
+        f = IPAddressField()
+        self.assertFormErrors([u'This field is required.'], f.clean, '')
+        self.assertFormErrors([u'This field is required.'], f.clean, None)
+        self.assertEqual(f.clean('127.0.0.1'), u'127.0.0.1')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, 'foo')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, '127.0.0.')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, '1.2.3.4.5')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, '256.125.1.5')
+
+        f = IPAddressField(required=False)
+        self.assertEqual(f.clean(''), u'')
+        self.assertEqual(f.clean(None), u'')
+        self.assertEqual(f.clean('127.0.0.1'), u'127.0.0.1')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, 'foo')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, '127.0.0.')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, '1.2.3.4.5')
+        self.assertFormErrors([u'Enter a valid IPv4 address.'], f.clean, '256.125.1.5')
+
+    def test_smart_unicode(self):
+        class Test:
+            def __str__(self):
+               return 'ŠĐĆŽćžšđ'
+
+        class TestU:
+            def __str__(self):
+               return 'Foo'
+            def __unicode__(self):
+               return u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111'
+
+        self.assertEqual(smart_unicode(Test()), u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111')
+        self.assertEqual(smart_unicode(TestU()), u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111')
+        self.assertEqual(smart_unicode(1), u'1')
+        self.assertEqual(smart_unicode('foo'), u'foo')
+
+    def test_accessing_clean(self):
+        class UserForm(Form):
+            username = CharField(max_length=10)
+            password = CharField(widget=PasswordInput)
+
+            def clean(self):
+                data = self.cleaned_data
+
+                if not self.errors:
+                    data['username'] = data['username'].lower()
+
+                return data
+
+        f = UserForm({'username': 'SirRobin', 'password': 'blue'})
+        self.assertTrue(f.is_valid())
+        self.assertEqual(f.cleaned_data['username'], u'sirrobin')
+
+    def test_overriding_errorlist(self):
+        class DivErrorList(ErrorList):
+            def __unicode__(self):
+                return self.as_divs()
+
+            def as_divs(self):
+                if not self: return u''
+                return u'<div class="errorlist">%s</div>' % ''.join([u'<div class="error">%s</div>' % force_unicode(e) for e in self])
+
+        class CommentForm(Form):
+            name = CharField(max_length=50, required=False)
+            email = EmailField()
+            comment = CharField()
+
+        data = dict(email='invalid')
+        f = CommentForm(data, auto_id=False, error_class=DivErrorList)
+        self.assertEqual(f.as_p(), """<p>Name: <input type="text" name="name" maxlength="50" /></p>
+<div class="errorlist"><div class="error">Enter a valid e-mail address.</div></div>
+<p>Email: <input type="text" name="email" value="invalid" /></p>
+<div class="errorlist"><div class="error">This field is required.</div></div>
+<p>Comment: <input type="text" name="comment" /></p>""")
+
+    def test_multipart_encoded_form(self):
+        class FormWithoutFile(Form):
+            username = CharField()
+
+        class FormWithFile(Form):
+            username = CharField()
+            file = FileField()
+
+        class FormWithImage(Form):
+            image = ImageField()
+
+        self.assertFalse(FormWithoutFile().is_multipart())
+        self.assertTrue(FormWithFile().is_multipart())
+        self.assertTrue(FormWithImage().is_multipart())
+
+
+class FormsExtraL10NTestCase(unittest.TestCase):
+    def setUp(self):
+        super(FormsExtraL10NTestCase, self).setUp()
+        self.old_use_l10n = getattr(settings, 'USE_L10N', False)
+        settings.USE_L10N = True
+        translation.activate('nl')
+
+    def tearDown(self):
+        translation.deactivate()
+        settings.USE_L10N = self.old_use_l10n
+        super(FormsExtraL10NTestCase, self).tearDown()
+
+    def test_l10n(self):
+        w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016'), required=False)
+        self.assertEqual(w.value_from_datadict({'date_year': '2010', 'date_month': '8', 'date_day': '13'}, {}, 'date'), '13-08-2010')
+
+        self.assertEqual(w.render('date', '13-08-2010'), """<select name="date_day" id="id_date_day">
+<option value="0">---</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+<option value="6">6</option>
+<option value="7">7</option>
+<option value="8">8</option>
+<option value="9">9</option>
+<option value="10">10</option>
+<option value="11">11</option>
+<option value="12">12</option>
+<option value="13" selected="selected">13</option>
+<option value="14">14</option>
+<option value="15">15</option>
+<option value="16">16</option>
+<option value="17">17</option>
+<option value="18">18</option>
+<option value="19">19</option>
+<option value="20">20</option>
+<option value="21">21</option>
+<option value="22">22</option>
+<option value="23">23</option>
+<option value="24">24</option>
+<option value="25">25</option>
+<option value="26">26</option>
+<option value="27">27</option>
+<option value="28">28</option>
+<option value="29">29</option>
+<option value="30">30</option>
+<option value="31">31</option>
+</select>
+<select name="date_month" id="id_date_month">
+<option value="0">---</option>
+<option value="1">januari</option>
+<option value="2">februari</option>
+<option value="3">maart</option>
+<option value="4">april</option>
+<option value="5">mei</option>
+<option value="6">juni</option>
+<option value="7">juli</option>
+<option value="8" selected="selected">augustus</option>
+<option value="9">september</option>
+<option value="10">oktober</option>
+<option value="11">november</option>
+<option value="12">december</option>
+</select>
+<select name="date_year" id="id_date_year">
+<option value="0">---</option>
+<option value="2007">2007</option>
+<option value="2008">2008</option>
+<option value="2009">2009</option>
+<option value="2010" selected="selected">2010</option>
+<option value="2011">2011</option>
+<option value="2012">2012</option>
+<option value="2013">2013</option>
+<option value="2014">2014</option>
+<option value="2015">2015</option>
+<option value="2016">2016</option>
+</select>""")
+
+        # Years before 1900 work
+        w = SelectDateWidget(years=('1899',))
+        self.assertEqual(w.value_from_datadict({'date_year': '1899', 'date_month': '8', 'date_day': '13'}, {}, 'date'), '13-08-1899')
diff --git a/parts/django/tests/regressiontests/forms/tests/fields.py b/parts/django/tests/regressiontests/forms/tests/fields.py
new file mode 100644
index 0000000..133a183
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/fields.py
@@ -0,0 +1,862 @@
+# -*- coding: utf-8 -*-
+"""
+##########
+# Fields #
+##########
+
+Each Field class does some sort of validation. Each Field has a clean() method,
+which either raises django.forms.ValidationError or returns the "clean"
+data -- usually a Unicode object, but, in some rare cases, a list.
+
+Each Field's __init__() takes at least these parameters:
+    required -- Boolean that specifies whether the field is required.
+                True by default.
+    widget -- A Widget class, or instance of a Widget class, that should be
+              used for this Field when displaying it. Each Field has a default
+              Widget that it'll use if you don't specify this. In most cases,
+              the default widget is TextInput.
+    label -- A verbose name for this field, for use in displaying this field in
+             a form. By default, Django will use a "pretty" version of the form
+             field name, if the Field is part of a Form.
+    initial -- A value to use in this Field's initial display. This value is
+               *not* used as a fallback if data isn't given.
+
+Other than that, the Field subclasses have class-specific options for
+__init__(). For example, CharField has a max_length option.
+"""
+import datetime
+import time
+import re
+import os
+from decimal import Decimal
+
+from unittest import TestCase
+
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.forms import *
+from django.forms.widgets import RadioFieldRenderer
+
+
+def fix_os_paths(x):
+    if isinstance(x, basestring):
+        return x.replace('\\', '/')
+    elif isinstance(x, tuple):
+        return tuple(fix_os_paths(list(x)))
+    elif isinstance(x, list):
+        return [fix_os_paths(y) for y in x]
+    else:
+        return x
+
+
+class FieldsTests(TestCase):
+
+    def assertRaisesErrorWithMessage(self, error, message, callable, *args, **kwargs):
+        self.assertRaises(error, callable, *args, **kwargs)
+        try:
+            callable(*args, **kwargs)
+        except error, e:
+            self.assertEqual(message, str(e))
+
+    # CharField ###################################################################
+
+    def test_charfield_1(self):
+        f = CharField()
+        self.assertEqual(u'1', f.clean(1))
+        self.assertEqual(u'hello', f.clean('hello'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertEqual(u'[1, 2, 3]', f.clean([1, 2, 3]))
+
+    def test_charfield_2(self):
+        f = CharField(required=False)
+        self.assertEqual(u'1', f.clean(1))
+        self.assertEqual(u'hello', f.clean('hello'))
+        self.assertEqual(u'', f.clean(None))
+        self.assertEqual(u'', f.clean(''))
+        self.assertEqual(u'[1, 2, 3]', f.clean([1, 2, 3]))
+
+    def test_charfield_3(self):
+        f = CharField(max_length=10, required=False)
+        self.assertEqual(u'12345', f.clean('12345'))
+        self.assertEqual(u'1234567890', f.clean('1234567890'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 10 characters (it has 11).']", f.clean, '1234567890a')
+
+    def test_charfield_4(self):
+        f = CharField(min_length=10, required=False)
+        self.assertEqual(u'', f.clean(''))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 10 characters (it has 5).']", f.clean, '12345')
+        self.assertEqual(u'1234567890', f.clean('1234567890'))
+        self.assertEqual(u'1234567890a', f.clean('1234567890a'))
+
+    def test_charfield_5(self):
+        f = CharField(min_length=10, required=True)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 10 characters (it has 5).']", f.clean, '12345')
+        self.assertEqual(u'1234567890', f.clean('1234567890'))
+        self.assertEqual(u'1234567890a', f.clean('1234567890a'))
+
+    # IntegerField ################################################################
+
+    def test_integerfield_1(self):
+        f = IntegerField()
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(1, f.clean('1'))
+        self.assertEqual(True, isinstance(f.clean('1'), int))
+        self.assertEqual(23, f.clean('23'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a whole number.']", f.clean, 'a')
+        self.assertEqual(42, f.clean(42))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a whole number.']", f.clean, 3.14)
+        self.assertEqual(1, f.clean('1 '))
+        self.assertEqual(1, f.clean(' 1'))
+        self.assertEqual(1, f.clean(' 1 '))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a whole number.']", f.clean, '1a')
+
+    def test_integerfield_2(self):
+        f = IntegerField(required=False)
+        self.assertEqual(None, f.clean(''))
+        self.assertEqual('None', repr(f.clean('')))
+        self.assertEqual(None, f.clean(None))
+        self.assertEqual('None', repr(f.clean(None)))
+        self.assertEqual(1, f.clean('1'))
+        self.assertEqual(True, isinstance(f.clean('1'), int))
+        self.assertEqual(23, f.clean('23'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a whole number.']", f.clean, 'a')
+        self.assertEqual(1, f.clean('1 '))
+        self.assertEqual(1, f.clean(' 1'))
+        self.assertEqual(1, f.clean(' 1 '))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a whole number.']", f.clean, '1a')
+
+    def test_integerfield_3(self):
+        f = IntegerField(max_value=10)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(1, f.clean(1))
+        self.assertEqual(10, f.clean(10))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is less than or equal to 10.']", f.clean, 11)
+        self.assertEqual(10, f.clean('10'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is less than or equal to 10.']", f.clean, '11')
+
+    def test_integerfield_4(self):
+        f = IntegerField(min_value=10)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is greater than or equal to 10.']", f.clean, 1)
+        self.assertEqual(10, f.clean(10))
+        self.assertEqual(11, f.clean(11))
+        self.assertEqual(10, f.clean('10'))
+        self.assertEqual(11, f.clean('11'))
+
+    def test_integerfield_5(self):
+        f = IntegerField(min_value=10, max_value=20)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is greater than or equal to 10.']", f.clean, 1)
+        self.assertEqual(10, f.clean(10))
+        self.assertEqual(11, f.clean(11))
+        self.assertEqual(10, f.clean('10'))
+        self.assertEqual(11, f.clean('11'))
+        self.assertEqual(20, f.clean(20))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is less than or equal to 20.']", f.clean, 21)
+
+    # FloatField ##################################################################
+
+    def test_floatfield_1(self):
+        f = FloatField()
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(1.0, f.clean('1'))
+        self.assertEqual(True, isinstance(f.clean('1'), float))
+        self.assertEqual(23.0, f.clean('23'))
+        self.assertEqual(3.1400000000000001, f.clean('3.14'))
+        self.assertEqual(3.1400000000000001, f.clean(3.14))
+        self.assertEqual(42.0, f.clean(42))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, 'a')
+        self.assertEqual(1.0, f.clean('1.0 '))
+        self.assertEqual(1.0, f.clean(' 1.0'))
+        self.assertEqual(1.0, f.clean(' 1.0 '))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, '1.0a')
+
+    def test_floatfield_2(self):
+        f = FloatField(required=False)
+        self.assertEqual(None, f.clean(''))
+        self.assertEqual(None, f.clean(None))
+        self.assertEqual(1.0, f.clean('1'))
+
+    def test_floatfield_3(self):
+        f = FloatField(max_value=1.5, min_value=0.5)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is less than or equal to 1.5.']", f.clean, '1.6')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is greater than or equal to 0.5.']", f.clean, '0.4')
+        self.assertEqual(1.5, f.clean('1.5'))
+        self.assertEqual(0.5, f.clean('0.5'))
+
+    # DecimalField ################################################################
+
+    def test_decimalfield_1(self):
+        f = DecimalField(max_digits=4, decimal_places=2)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(f.clean('1'), Decimal("1"))
+        self.assertEqual(True, isinstance(f.clean('1'), Decimal))
+        self.assertEqual(f.clean('23'), Decimal("23"))
+        self.assertEqual(f.clean('3.14'), Decimal("3.14"))
+        self.assertEqual(f.clean(3.14), Decimal("3.14"))
+        self.assertEqual(f.clean(Decimal('3.14')), Decimal("3.14"))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, 'NaN')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, 'Inf')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, '-Inf')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, 'a')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, u'łąść')
+        self.assertEqual(f.clean('1.0 '), Decimal("1.0"))
+        self.assertEqual(f.clean(' 1.0'), Decimal("1.0"))
+        self.assertEqual(f.clean(' 1.0 '), Decimal("1.0"))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, '1.0a')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 4 digits in total.']", f.clean, '123.45')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 2 decimal places.']", f.clean, '1.234')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 2 digits before the decimal point.']", f.clean, '123.4')
+        self.assertEqual(f.clean('-12.34'), Decimal("-12.34"))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 4 digits in total.']", f.clean, '-123.45')
+        self.assertEqual(f.clean('-.12'), Decimal("-0.12"))
+        self.assertEqual(f.clean('-00.12'), Decimal("-0.12"))
+        self.assertEqual(f.clean('-000.12'), Decimal("-0.12"))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 2 decimal places.']", f.clean, '-000.123')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 4 digits in total.']", f.clean, '-000.12345')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a number.']", f.clean, '--0.12')
+
+    def test_decimalfield_2(self):
+        f = DecimalField(max_digits=4, decimal_places=2, required=False)
+        self.assertEqual(None, f.clean(''))
+        self.assertEqual(None, f.clean(None))
+        self.assertEqual(f.clean('1'), Decimal("1"))
+
+    def test_decimalfield_3(self):
+        f = DecimalField(max_digits=4, decimal_places=2, max_value=Decimal('1.5'), min_value=Decimal('0.5'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is less than or equal to 1.5.']", f.clean, '1.6')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value is greater than or equal to 0.5.']", f.clean, '0.4')
+        self.assertEqual(f.clean('1.5'), Decimal("1.5"))
+        self.assertEqual(f.clean('0.5'), Decimal("0.5"))
+        self.assertEqual(f.clean('.5'), Decimal("0.5"))
+        self.assertEqual(f.clean('00.50'), Decimal("0.50"))
+
+    def test_decimalfield_4(self):
+        f = DecimalField(decimal_places=2)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 2 decimal places.']", f.clean, '0.00000001')
+
+    def test_decimalfield_5(self):
+        f = DecimalField(max_digits=3)
+        # Leading whole zeros "collapse" to one digit.
+        self.assertEqual(f.clean('0000000.10'), Decimal("0.1"))
+        # But a leading 0 before the . doesn't count towards max_digits
+        self.assertEqual(f.clean('0000000.100'), Decimal("0.100"))
+        # Only leading whole zeros "collapse" to one digit.
+        self.assertEqual(f.clean('000000.02'), Decimal('0.02'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 3 digits in total.']", f.clean, '000000.0002')
+        self.assertEqual(f.clean('.002'), Decimal("0.002"))
+
+    def test_decimalfield_6(self):
+        f = DecimalField(max_digits=2, decimal_places=2)
+        self.assertEqual(f.clean('.01'), Decimal(".01"))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure that there are no more than 0 digits before the decimal point.']", f.clean, '1.1')
+
+    # DateField ###################################################################
+
+    def test_datefield_1(self):
+        f = DateField()
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean(datetime.date(2006, 10, 25)))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean(datetime.datetime(2006, 10, 25, 14, 30)))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59)))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59, 200)))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('2006-10-25'))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('10/25/2006'))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('10/25/06'))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('Oct 25 2006'))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('October 25 2006'))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('October 25, 2006'))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('25 October 2006'))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('25 October, 2006'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, '2006-4-31')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, '200a-10-25')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, '25/10/06')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+
+    def test_datefield_2(self):
+        f = DateField(required=False)
+        self.assertEqual(None, f.clean(None))
+        self.assertEqual('None', repr(f.clean(None)))
+        self.assertEqual(None, f.clean(''))
+        self.assertEqual('None', repr(f.clean('')))
+
+    def test_datefield_3(self):
+        f = DateField(input_formats=['%Y %m %d'])
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean(datetime.date(2006, 10, 25)))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean(datetime.datetime(2006, 10, 25, 14, 30)))
+        self.assertEqual(datetime.date(2006, 10, 25), f.clean('2006 10 25'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, '2006-10-25')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, '10/25/2006')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, '10/25/06')
+
+    # TimeField ###################################################################
+
+    def test_timefield_1(self):
+        f = TimeField()
+        self.assertEqual(datetime.time(14, 25), f.clean(datetime.time(14, 25)))
+        self.assertEqual(datetime.time(14, 25, 59), f.clean(datetime.time(14, 25, 59)))
+        self.assertEqual(datetime.time(14, 25), f.clean('14:25'))
+        self.assertEqual(datetime.time(14, 25, 59), f.clean('14:25:59'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid time.']", f.clean, 'hello')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid time.']", f.clean, '1:24 p.m.')
+
+    def test_timefield_2(self):
+        f = TimeField(input_formats=['%I:%M %p'])
+        self.assertEqual(datetime.time(14, 25), f.clean(datetime.time(14, 25)))
+        self.assertEqual(datetime.time(14, 25, 59), f.clean(datetime.time(14, 25, 59)))
+        self.assertEqual(datetime.time(4, 25), f.clean('4:25 AM'))
+        self.assertEqual(datetime.time(16, 25), f.clean('4:25 PM'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid time.']", f.clean, '14:30:45')
+
+    # DateTimeField ###############################################################
+
+    def test_datetimefield_1(self):
+        f = DateTimeField()
+        self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(datetime.date(2006, 10, 25)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean(datetime.datetime(2006, 10, 25, 14, 30)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 59), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 59, 200), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59, 200)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean('2006-10-25 14:30:45'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006-10-25 14:30:00'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006-10-25 14:30'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean('2006-10-25'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean('10/25/2006 14:30:45'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/2006 14:30:00'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/2006 14:30'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean('10/25/2006'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 45), f.clean('10/25/06 14:30:45'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/06 14:30:00'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('10/25/06 14:30'))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean('10/25/06'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date/time.']", f.clean, 'hello')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date/time.']", f.clean, '2006-10-25 4:30 p.m.')
+
+    def test_datetimefield_2(self):
+        f = DateTimeField(input_formats=['%Y %m %d %I:%M %p'])
+        self.assertEqual(datetime.datetime(2006, 10, 25, 0, 0), f.clean(datetime.date(2006, 10, 25)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean(datetime.datetime(2006, 10, 25, 14, 30)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 59), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30, 59, 200), f.clean(datetime.datetime(2006, 10, 25, 14, 30, 59, 200)))
+        self.assertEqual(datetime.datetime(2006, 10, 25, 14, 30), f.clean('2006 10 25 2:30 PM'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date/time.']", f.clean, '2006-10-25 14:30:45')
+
+    def test_datetimefield_3(self):
+        f = DateTimeField(required=False)
+        self.assertEqual(None, f.clean(None))
+        self.assertEqual('None', repr(f.clean(None)))
+        self.assertEqual(None, f.clean(''))
+        self.assertEqual('None', repr(f.clean('')))
+
+    # RegexField ##################################################################
+
+    def test_regexfield_1(self):
+        f = RegexField('^\d[A-F]\d$')
+        self.assertEqual(u'2A2', f.clean('2A2'))
+        self.assertEqual(u'3F3', f.clean('3F3'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, '3G3')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, ' 2A2')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, '2A2 ')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+
+    def test_regexfield_2(self):
+        f = RegexField('^\d[A-F]\d$', required=False)
+        self.assertEqual(u'2A2', f.clean('2A2'))
+        self.assertEqual(u'3F3', f.clean('3F3'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, '3G3')
+        self.assertEqual(u'', f.clean(''))
+
+    def test_regexfield_3(self):
+        f = RegexField(re.compile('^\d[A-F]\d$'))
+        self.assertEqual(u'2A2', f.clean('2A2'))
+        self.assertEqual(u'3F3', f.clean('3F3'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, '3G3')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, ' 2A2')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, '2A2 ')
+
+    def test_regexfield_4(self):
+        f = RegexField('^\d\d\d\d$', error_message='Enter a four-digit number.')
+        self.assertEqual(u'1234', f.clean('1234'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a four-digit number.']", f.clean, '123')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a four-digit number.']", f.clean, 'abcd')
+
+    def test_regexfield_5(self):
+        f = RegexField('^\d+$', min_length=5, max_length=10)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 5 characters (it has 3).']", f.clean, '123')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 5 characters (it has 3).', u'Enter a valid value.']", f.clean, 'abc')
+        self.assertEqual(u'12345', f.clean('12345'))
+        self.assertEqual(u'1234567890', f.clean('1234567890'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 10 characters (it has 11).']", f.clean, '12345678901')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid value.']", f.clean, '12345a')
+
+    # EmailField ##################################################################
+
+    def test_emailfield_1(self):
+        f = EmailField()
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(u'person@example.com', f.clean('person@example.com'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo@')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo@bar')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'example@invalid-.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'example@-invalid.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'example@inv-.alid-.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'example@inv-.-alid.com')
+        self.assertEqual(u'example@valid-----hyphens.com', f.clean('example@valid-----hyphens.com'))
+        self.assertEqual(u'example@valid-with-hyphens.com', f.clean('example@valid-with-hyphens.com'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'example@.com')
+        self.assertEqual(u'local@domain.with.idn.xyz\xe4\xf6\xfc\xdfabc.part.com', f.clean('local@domain.with.idn.xyzäöüßabc.part.com'))
+
+    def test_email_regexp_for_performance(self):
+        f = EmailField()
+        # Check for runaway regex security problem. This will take for-freeking-ever
+        # if the security fix isn't in place.
+        self.assertRaisesErrorWithMessage(
+                ValidationError,
+                "[u'Enter a valid e-mail address.']",
+                f.clean,
+                'viewx3dtextx26qx3d@yahoo.comx26latlngx3d15854521645943074058'
+            )
+
+    def test_emailfield_2(self):
+        f = EmailField(required=False)
+        self.assertEqual(u'', f.clean(''))
+        self.assertEqual(u'', f.clean(None))
+        self.assertEqual(u'person@example.com', f.clean('person@example.com'))
+        self.assertEqual(u'example@example.com', f.clean('      example@example.com  \t   \t '))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo@')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'foo@bar')
+
+    def test_emailfield_3(self):
+        f = EmailField(min_length=10, max_length=15)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 10 characters (it has 9).']", f.clean, 'a@foo.com')
+        self.assertEqual(u'alf@foo.com', f.clean('alf@foo.com'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 15 characters (it has 20).']", f.clean, 'alf123456788@foo.com')
+
+    # FileField ##################################################################
+
+    def test_filefield_1(self):
+        f = FileField()
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '', '')
+        self.assertEqual('files/test1.pdf', f.clean('', 'files/test1.pdf'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None, '')
+        self.assertEqual('files/test2.pdf', f.clean(None, 'files/test2.pdf'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'No file was submitted. Check the encoding type on the form.']", f.clean, SimpleUploadedFile('', ''))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'No file was submitted. Check the encoding type on the form.']", f.clean, SimpleUploadedFile('', ''), '')
+        self.assertEqual('files/test3.pdf', f.clean(None, 'files/test3.pdf'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'No file was submitted. Check the encoding type on the form.']", f.clean, 'some content that is not a file')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'The submitted file is empty.']", f.clean, SimpleUploadedFile('name', None))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'The submitted file is empty.']", f.clean, SimpleUploadedFile('name', ''))
+        self.assertEqual(SimpleUploadedFile, type(f.clean(SimpleUploadedFile('name', 'Some File Content'))))
+        self.assertEqual(SimpleUploadedFile, type(f.clean(SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह'))))
+        self.assertEqual(SimpleUploadedFile, type(f.clean(SimpleUploadedFile('name', 'Some File Content'), 'files/test4.pdf')))
+
+    def test_filefield_2(self):
+        f = FileField(max_length = 5)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this filename has at most 5 characters (it has 18).']", f.clean, SimpleUploadedFile('test_maxlength.txt', 'hello world'))
+        self.assertEqual('files/test1.pdf', f.clean('', 'files/test1.pdf'))
+        self.assertEqual('files/test2.pdf', f.clean(None, 'files/test2.pdf'))
+        self.assertEqual(SimpleUploadedFile, type(f.clean(SimpleUploadedFile('name', 'Some File Content'))))
+
+    # URLField ##################################################################
+
+    def test_urlfield_1(self):
+        f = URLField()
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(u'http://localhost/', f.clean('http://localhost'))
+        self.assertEqual(u'http://example.com/', f.clean('http://example.com'))
+        self.assertEqual(u'http://example.com./', f.clean('http://example.com.'))
+        self.assertEqual(u'http://www.example.com/', f.clean('http://www.example.com'))
+        self.assertEqual(u'http://www.example.com:8000/test', f.clean('http://www.example.com:8000/test'))
+        self.assertEqual(u'http://valid-with-hyphens.com/', f.clean('valid-with-hyphens.com'))
+        self.assertEqual(u'http://subdomain.domain.com/', f.clean('subdomain.domain.com'))
+        self.assertEqual(u'http://200.8.9.10/', f.clean('http://200.8.9.10'))
+        self.assertEqual(u'http://200.8.9.10:8000/test', f.clean('http://200.8.9.10:8000/test'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'foo')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'com.')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, '.')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://invalid-.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://-invalid.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://inv-.alid-.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://inv-.-alid.com')
+        self.assertEqual(u'http://valid-----hyphens.com/', f.clean('http://valid-----hyphens.com'))
+        self.assertEqual(u'http://some.idn.xyz\xe4\xf6\xfc\xdfabc.domain.com:123/blah', f.clean('http://some.idn.xyzäöüßabc.domain.com:123/blah'))
+        self.assertEqual(u'http://www.example.com/s/http://code.djangoproject.com/ticket/13804', f.clean('www.example.com/s/http://code.djangoproject.com/ticket/13804'))
+
+    def test_url_regex_ticket11198(self):
+        f = URLField()
+        # hangs "forever" if catastrophic backtracking in ticket:#11198 not fixed
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://%s' % ("X"*200,))
+
+        # a second test, to make sure the problem is really addressed, even on
+        # domains that don't fail the domain label length check in the regex
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://%s' % ("X"*60,))
+
+    def test_urlfield_2(self):
+        f = URLField(required=False)
+        self.assertEqual(u'', f.clean(''))
+        self.assertEqual(u'', f.clean(None))
+        self.assertEqual(u'http://example.com/', f.clean('http://example.com'))
+        self.assertEqual(u'http://www.example.com/', f.clean('http://www.example.com'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'foo')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
+
+    def test_urlfield_3(self):
+        f = URLField(verify_exists=True)
+        self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example')
+        self.assertRaises(ValidationError, f.clean, 'http://www.broken.djangoproject.com') # bad domain
+        try:
+            f.clean('http://www.broken.djangoproject.com') # bad domain
+        except ValidationError, e:
+            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+        self.assertRaises(ValidationError, f.clean, 'http://google.com/we-love-microsoft.html') # good domain, bad page
+        try:
+            f.clean('http://google.com/we-love-microsoft.html') # good domain, bad page
+        except ValidationError, e:
+            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+        # Valid and existent IDN
+        self.assertEqual(u'http://\u05e2\u05d1\u05e8\u05d9\u05ea.idn.icann.org/', f.clean(u'http://עברית.idn.icann.org/'))
+        # Valid but non-existent IDN
+        try:
+            f.clean(u'http://broken.עברית.idn.icann.org/')
+        except ValidationError, e:
+            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+
+    def test_urlfield_4(self):
+        f = URLField(verify_exists=True, required=False)
+        self.assertEqual(u'', f.clean(''))
+        self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
+
+    def test_urlfield_5(self):
+        f = URLField(min_length=15, max_length=20)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 15 characters (it has 13).']", f.clean, 'http://f.com')
+        self.assertEqual(u'http://example.com/', f.clean('http://example.com'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 20 characters (it has 38).']", f.clean, 'http://abcdefghijklmnopqrstuvwxyz.com')
+
+    def test_urlfield_6(self):
+        f = URLField(required=False)
+        self.assertEqual(u'http://example.com/', f.clean('example.com'))
+        self.assertEqual(u'', f.clean(''))
+        self.assertEqual(u'https://example.com/', f.clean('https://example.com'))
+
+    def test_urlfield_7(self):
+        f = URLField()
+        self.assertEqual(u'http://example.com/', f.clean('http://example.com'))
+        self.assertEqual(u'http://example.com/test', f.clean('http://example.com/test'))
+
+    def test_urlfield_ticket11826(self):
+        f = URLField()
+        self.assertEqual(u'http://example.com/?some_param=some_value', f.clean('http://example.com?some_param=some_value'))
+
+    # BooleanField ################################################################
+
+    def test_booleanfield_1(self):
+        f = BooleanField()
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(True, f.clean(True))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, False)
+        self.assertEqual(True, f.clean(1))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, 0)
+        self.assertEqual(True, f.clean('Django rocks'))
+        self.assertEqual(True, f.clean('True'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, 'False')
+
+    def test_booleanfield_2(self):
+        f = BooleanField(required=False)
+        self.assertEqual(False, f.clean(''))
+        self.assertEqual(False, f.clean(None))
+        self.assertEqual(True, f.clean(True))
+        self.assertEqual(False, f.clean(False))
+        self.assertEqual(True, f.clean(1))
+        self.assertEqual(False, f.clean(0))
+        self.assertEqual(True, f.clean('1'))
+        self.assertEqual(False, f.clean('0'))
+        self.assertEqual(True, f.clean('Django rocks'))
+        self.assertEqual(False, f.clean('False'))
+
+    # ChoiceField #################################################################
+
+    def test_choicefield_1(self):
+        f = ChoiceField(choices=[('1', 'One'), ('2', 'Two')])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual(u'1', f.clean(1))
+        self.assertEqual(u'1', f.clean('1'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 3 is not one of the available choices.']", f.clean, '3')
+
+    def test_choicefield_2(self):
+        f = ChoiceField(choices=[('1', 'One'), ('2', 'Two')], required=False)
+        self.assertEqual(u'', f.clean(''))
+        self.assertEqual(u'', f.clean(None))
+        self.assertEqual(u'1', f.clean(1))
+        self.assertEqual(u'1', f.clean('1'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 3 is not one of the available choices.']", f.clean, '3')
+
+    def test_choicefield_3(self):
+        f = ChoiceField(choices=[('J', 'John'), ('P', 'Paul')])
+        self.assertEqual(u'J', f.clean('J'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. John is not one of the available choices.']", f.clean, 'John')
+
+    def test_choicefield_4(self):
+        f = ChoiceField(choices=[('Numbers', (('1', 'One'), ('2', 'Two'))), ('Letters', (('3','A'),('4','B'))), ('5','Other')])
+        self.assertEqual(u'1', f.clean(1))
+        self.assertEqual(u'1', f.clean('1'))
+        self.assertEqual(u'3', f.clean(3))
+        self.assertEqual(u'3', f.clean('3'))
+        self.assertEqual(u'5', f.clean(5))
+        self.assertEqual(u'5', f.clean('5'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 6 is not one of the available choices.']", f.clean, '6')
+
+    # TypedChoiceField ############################################################
+    # TypedChoiceField is just like ChoiceField, except that coerced types will
+    # be returned:
+
+    def test_typedchoicefield_1(self):
+        f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int)
+        self.assertEqual(1, f.clean('1'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 2 is not one of the available choices.']", f.clean, '2')
+
+    def test_typedchoicefield_2(self):
+        # Different coercion, same validation.
+        f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=float)
+        self.assertEqual(1.0, f.clean('1'))
+
+    def test_typedchoicefield_3(self):
+        # This can also cause weirdness: be careful (bool(-1) == True, remember)
+        f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=bool)
+        self.assertEqual(True, f.clean('-1'))
+
+    def test_typedchoicefield_4(self):
+        # Even more weirdness: if you have a valid choice but your coercion function
+        # can't coerce, you'll still get a validation error. Don't do this!
+        f = TypedChoiceField(choices=[('A', 'A'), ('B', 'B')], coerce=int)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. B is not one of the available choices.']", f.clean, 'B')
+        # Required fields require values
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+
+    def test_typedchoicefield_5(self):
+        # Non-required fields aren't required
+        f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=False)
+        self.assertEqual('', f.clean(''))
+        # If you want cleaning an empty value to return a different type, tell the field
+
+    def test_typedchoicefield_6(self):
+        f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=False, empty_value=None)
+        self.assertEqual(None, f.clean(''))
+
+    # NullBooleanField ############################################################
+
+    def test_nullbooleanfield_1(self):
+        f = NullBooleanField()
+        self.assertEqual(None, f.clean(''))
+        self.assertEqual(True, f.clean(True))
+        self.assertEqual(False, f.clean(False))
+        self.assertEqual(None, f.clean(None))
+        self.assertEqual(False, f.clean('0'))
+        self.assertEqual(True, f.clean('1'))
+        self.assertEqual(None, f.clean('2'))
+        self.assertEqual(None, f.clean('3'))
+        self.assertEqual(None, f.clean('hello'))
+
+
+    def test_nullbooleanfield_2(self):
+        # Make sure that the internal value is preserved if using HiddenInput (#7753)
+        class HiddenNullBooleanForm(Form):
+            hidden_nullbool1 = NullBooleanField(widget=HiddenInput, initial=True)
+            hidden_nullbool2 = NullBooleanField(widget=HiddenInput, initial=False)
+        f = HiddenNullBooleanForm()
+        self.assertEqual('<input type="hidden" name="hidden_nullbool1" value="True" id="id_hidden_nullbool1" /><input type="hidden" name="hidden_nullbool2" value="False" id="id_hidden_nullbool2" />', str(f))
+
+    def test_nullbooleanfield_3(self):
+        class HiddenNullBooleanForm(Form):
+            hidden_nullbool1 = NullBooleanField(widget=HiddenInput, initial=True)
+            hidden_nullbool2 = NullBooleanField(widget=HiddenInput, initial=False)
+        f = HiddenNullBooleanForm({ 'hidden_nullbool1': 'True', 'hidden_nullbool2': 'False' })
+        self.assertEqual(None, f.full_clean())
+        self.assertEqual(True, f.cleaned_data['hidden_nullbool1'])
+        self.assertEqual(False, f.cleaned_data['hidden_nullbool2'])
+
+    def test_nullbooleanfield_4(self):
+        # Make sure we're compatible with MySQL, which uses 0 and 1 for its boolean
+        # values. (#9609)
+        NULLBOOL_CHOICES = (('1', 'Yes'), ('0', 'No'), ('', 'Unknown'))
+        class MySQLNullBooleanForm(Form):
+            nullbool0 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))
+            nullbool1 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))
+            nullbool2 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))
+        f = MySQLNullBooleanForm({ 'nullbool0': '1', 'nullbool1': '0', 'nullbool2': '' })
+        self.assertEqual(None, f.full_clean())
+        self.assertEqual(True, f.cleaned_data['nullbool0'])
+        self.assertEqual(False, f.cleaned_data['nullbool1'])
+        self.assertEqual(None, f.cleaned_data['nullbool2'])
+
+    # MultipleChoiceField #########################################################
+
+    def test_multiplechoicefield_1(self):
+        f = MultipleChoiceField(choices=[('1', 'One'), ('2', 'Two')])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertEqual([u'1'], f.clean([1]))
+        self.assertEqual([u'1'], f.clean(['1']))
+        self.assertEqual([u'1', u'2'], f.clean(['1', '2']))
+        self.assertEqual([u'1', u'2'], f.clean([1, '2']))
+        self.assertEqual([u'1', u'2'], f.clean((1, '2')))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a list of values.']", f.clean, 'hello')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, [])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, ())
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 3 is not one of the available choices.']", f.clean, ['3'])
+
+    def test_multiplechoicefield_2(self):
+        f = MultipleChoiceField(choices=[('1', 'One'), ('2', 'Two')], required=False)
+        self.assertEqual([], f.clean(''))
+        self.assertEqual([], f.clean(None))
+        self.assertEqual([u'1'], f.clean([1]))
+        self.assertEqual([u'1'], f.clean(['1']))
+        self.assertEqual([u'1', u'2'], f.clean(['1', '2']))
+        self.assertEqual([u'1', u'2'], f.clean([1, '2']))
+        self.assertEqual([u'1', u'2'], f.clean((1, '2')))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a list of values.']", f.clean, 'hello')
+        self.assertEqual([], f.clean([]))
+        self.assertEqual([], f.clean(()))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 3 is not one of the available choices.']", f.clean, ['3'])
+
+    def test_multiplechoicefield_3(self):
+        f = MultipleChoiceField(choices=[('Numbers', (('1', 'One'), ('2', 'Two'))), ('Letters', (('3','A'),('4','B'))), ('5','Other')])
+        self.assertEqual([u'1'], f.clean([1]))
+        self.assertEqual([u'1'], f.clean(['1']))
+        self.assertEqual([u'1', u'5'], f.clean([1, 5]))
+        self.assertEqual([u'1', u'5'], f.clean([1, '5']))
+        self.assertEqual([u'1', u'5'], f.clean(['1', 5]))
+        self.assertEqual([u'1', u'5'], f.clean(['1', '5']))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 6 is not one of the available choices.']", f.clean, ['6'])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. 6 is not one of the available choices.']", f.clean, ['1','6'])
+
+    # ComboField ##################################################################
+
+    def test_combofield_1(self):
+        f = ComboField(fields=[CharField(max_length=20), EmailField()])
+        self.assertEqual(u'test@example.com', f.clean('test@example.com'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 20 characters (it has 28).']", f.clean, 'longemailaddress@example.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'not an e-mail')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+
+    def test_combofield_2(self):
+        f = ComboField(fields=[CharField(max_length=20), EmailField()], required=False)
+        self.assertEqual(u'test@example.com', f.clean('test@example.com'))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at most 20 characters (it has 28).']", f.clean, 'longemailaddress@example.com')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid e-mail address.']", f.clean, 'not an e-mail')
+        self.assertEqual(u'', f.clean(''))
+        self.assertEqual(u'', f.clean(None))
+
+    # FilePathField ###############################################################
+
+    def test_filepathfield_1(self):
+        path = os.path.abspath(forms.__file__)
+        path = os.path.dirname(path) + '/'
+        self.assertTrue(fix_os_paths(path).endswith('/django/forms/'))
+
+    def test_filepathfield_2(self):
+        path = forms.__file__
+        path = os.path.dirname(os.path.abspath(path)) + '/'
+        f = FilePathField(path=path)
+        f.choices = [p for p in f.choices if p[0].endswith('.py')]
+        f.choices.sort()
+        expected = [
+                ('/django/forms/__init__.py', '__init__.py'),
+                ('/django/forms/fields.py', 'fields.py'),
+                ('/django/forms/forms.py', 'forms.py'),
+                ('/django/forms/formsets.py', 'formsets.py'),
+                ('/django/forms/models.py', 'models.py'),
+                ('/django/forms/util.py', 'util.py'),
+                ('/django/forms/widgets.py', 'widgets.py')
+            ]
+        for exp, got in zip(expected, fix_os_paths(f.choices)):
+            self.assertEqual(exp[1], got[1])
+            self.assertTrue(got[0].endswith(exp[0]))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Select a valid choice. fields.py is not one of the available choices.']", f.clean, 'fields.py')
+        assert fix_os_paths(f.clean(path + 'fields.py')).endswith('/django/forms/fields.py')
+
+    def test_filepathfield_3(self):
+        path = forms.__file__
+        path = os.path.dirname(os.path.abspath(path)) + '/'
+        f = FilePathField(path=path, match='^.*?\.py$')
+        f.choices.sort()
+        expected = [
+                ('/django/forms/__init__.py', '__init__.py'),
+                ('/django/forms/fields.py', 'fields.py'),
+                ('/django/forms/forms.py', 'forms.py'),
+                ('/django/forms/formsets.py', 'formsets.py'),
+                ('/django/forms/models.py', 'models.py'),
+                ('/django/forms/util.py', 'util.py'),
+                ('/django/forms/widgets.py', 'widgets.py')
+            ]
+        for exp, got in zip(expected, fix_os_paths(f.choices)):
+            self.assertEqual(exp[1], got[1])
+            self.assertTrue(got[0].endswith(exp[0]))
+
+    def test_filepathfield_4(self):
+        path = os.path.abspath(forms.__file__)
+        path = os.path.dirname(path) + '/'
+        f = FilePathField(path=path, recursive=True, match='^.*?\.py$')
+        f.choices.sort()
+        expected = [
+                ('/django/forms/__init__.py', '__init__.py'),
+                ('/django/forms/extras/__init__.py', 'extras/__init__.py'),
+                ('/django/forms/extras/widgets.py', 'extras/widgets.py'),
+                ('/django/forms/fields.py', 'fields.py'),
+                ('/django/forms/forms.py', 'forms.py'),
+                ('/django/forms/formsets.py', 'formsets.py'),
+                ('/django/forms/models.py', 'models.py'),
+                ('/django/forms/util.py', 'util.py'),
+                ('/django/forms/widgets.py', 'widgets.py')
+            ]
+        for exp, got in zip(expected, fix_os_paths(f.choices)):
+            self.assertEqual(exp[1], got[1])
+            self.assertTrue(got[0].endswith(exp[0]))
+
+    # SplitDateTimeField ##########################################################
+
+    def test_splitdatetimefield_1(self):
+        from django.forms.widgets import SplitDateTimeWidget
+        f = SplitDateTimeField()
+        assert isinstance(f.widget, SplitDateTimeWidget)
+        self.assertEqual(datetime.datetime(2006, 1, 10, 7, 30), f.clean([datetime.date(2006, 1, 10), datetime.time(7, 30)]))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, None)
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'This field is required.']", f.clean, '')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a list of values.']", f.clean, 'hello')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.', u'Enter a valid time.']", f.clean, ['hello', 'there'])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid time.']", f.clean, ['2006-01-10', 'there'])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, ['hello', '07:30'])
+
+    def test_splitdatetimefield_2(self):
+        f = SplitDateTimeField(required=False)
+        self.assertEqual(datetime.datetime(2006, 1, 10, 7, 30), f.clean([datetime.date(2006, 1, 10), datetime.time(7, 30)]))
+        self.assertEqual(datetime.datetime(2006, 1, 10, 7, 30), f.clean(['2006-01-10', '07:30']))
+        self.assertEqual(None, f.clean(None))
+        self.assertEqual(None, f.clean(''))
+        self.assertEqual(None, f.clean(['']))
+        self.assertEqual(None, f.clean(['', '']))
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a list of values.']", f.clean, 'hello')
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.', u'Enter a valid time.']", f.clean, ['hello', 'there'])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid time.']", f.clean, ['2006-01-10', 'there'])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, ['hello', '07:30'])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid time.']", f.clean, ['2006-01-10', ''])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid time.']", f.clean, ['2006-01-10'])
+        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid date.']", f.clean, ['', '07:30'])
diff --git a/parts/django/tests/regressiontests/forms/tests/forms.py b/parts/django/tests/regressiontests/forms/tests/forms.py
new file mode 100644
index 0000000..e555a77
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/forms.py
@@ -0,0 +1,1700 @@
+# -*- coding: utf-8 -*-
+import datetime
+from decimal import Decimal
+import re
+import time
+from unittest import TestCase
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.forms import *
+from django.http import QueryDict
+from django.template import Template, Context
+from django.utils.datastructures import MultiValueDict, MergeDict
+from django.utils.safestring import mark_safe
+
+
+class Person(Form):
+    first_name = CharField()
+    last_name = CharField()
+    birthday = DateField()
+
+
+class PersonNew(Form):
+    first_name = CharField(widget=TextInput(attrs={'id': 'first_name_id'}))
+    last_name = CharField()
+    birthday = DateField()
+
+
+class FormsTestCase(TestCase):
+    # A Form is a collection of Fields. It knows how to validate a set of data and it
+    # knows how to render itself in a couple of default ways (e.g., an HTML table).
+    # You can pass it data in __init__(), as a dictionary.
+
+    def test_form(self):
+        # Pass a dictionary to a Form's __init__().
+        p = Person({'first_name': u'John', 'last_name': u'Lennon', 'birthday': u'1940-10-9'})
+
+        self.assertTrue(p.is_bound)
+        self.assertEqual(p.errors, {})
+        self.assertTrue(p.is_valid())
+        self.assertEqual(p.errors.as_ul(), u'')
+        self.assertEqual(p.errors.as_text(), u'')
+        self.assertEqual(p.cleaned_data["first_name"], u'John')
+        self.assertEqual(p.cleaned_data["last_name"], u'Lennon')
+        self.assertEqual(p.cleaned_data["birthday"], datetime.date(1940, 10, 9))
+        self.assertEqual(str(p['first_name']), '<input type="text" name="first_name" value="John" id="id_first_name" />')
+        self.assertEqual(str(p['last_name']), '<input type="text" name="last_name" value="Lennon" id="id_last_name" />')
+        self.assertEqual(str(p['birthday']), '<input type="text" name="birthday" value="1940-10-9" id="id_birthday" />')
+        try:
+            p['nonexistentfield']
+            self.fail('Attempts to access non-existent fields should fail.')
+        except KeyError:
+            pass
+
+        form_output = []
+
+        for boundfield in p:
+            form_output.append(str(boundfield))
+
+        self.assertEqual('\n'.join(form_output), """<input type="text" name="first_name" value="John" id="id_first_name" />
+<input type="text" name="last_name" value="Lennon" id="id_last_name" />
+<input type="text" name="birthday" value="1940-10-9" id="id_birthday" />""")
+
+        form_output = []
+
+        for boundfield in p:
+            form_output.append([boundfield.label, boundfield.data])
+
+        self.assertEqual(form_output, [
+            ['First name', u'John'],
+            ['Last name', u'Lennon'],
+            ['Birthday', u'1940-10-9']
+        ])
+        self.assertEqual(str(p), """<tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" value="John" id="id_first_name" /></td></tr>
+<tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" value="Lennon" id="id_last_name" /></td></tr>
+<tr><th><label for="id_birthday">Birthday:</label></th><td><input type="text" name="birthday" value="1940-10-9" id="id_birthday" /></td></tr>""")
+
+    def test_empty_dict(self):
+        # Empty dictionaries are valid, too.
+        p = Person({})
+        self.assertTrue(p.is_bound)
+        self.assertEqual(p.errors['first_name'], [u'This field is required.'])
+        self.assertEqual(p.errors['last_name'], [u'This field is required.'])
+        self.assertEqual(p.errors['birthday'], [u'This field is required.'])
+        self.assertFalse(p.is_valid())
+        try:
+            p.cleaned_data
+            self.fail('Attempts to access cleaned_data when validation fails should fail.')
+        except AttributeError:
+            pass
+        self.assertEqual(str(p), """<tr><th><label for="id_first_name">First name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="first_name" id="id_first_name" /></td></tr>
+<tr><th><label for="id_last_name">Last name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="last_name" id="id_last_name" /></td></tr>
+<tr><th><label for="id_birthday">Birthday:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="birthday" id="id_birthday" /></td></tr>""")
+        self.assertEqual(p.as_table(), """<tr><th><label for="id_first_name">First name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="first_name" id="id_first_name" /></td></tr>
+<tr><th><label for="id_last_name">Last name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="last_name" id="id_last_name" /></td></tr>
+<tr><th><label for="id_birthday">Birthday:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="birthday" id="id_birthday" /></td></tr>""")
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>This field is required.</li></ul><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul><label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday" /></li>""")
+        self.assertEqual(p.as_p(), """<ul class="errorlist"><li>This field is required.</li></ul>
+<p><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></p>
+<ul class="errorlist"><li>This field is required.</li></ul>
+<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name" /></p>
+<ul class="errorlist"><li>This field is required.</li></ul>
+<p><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday" /></p>""")
+
+    def test_unbound_form(self):
+        # If you don't pass any values to the Form's __init__(), or if you pass None,
+        # the Form will be considered unbound and won't do any validation. Form.errors
+        # will be an empty dictionary *but* Form.is_valid() will return False.
+        p = Person()
+        self.assertFalse(p.is_bound)
+        self.assertEqual(p.errors, {})
+        self.assertFalse(p.is_valid())
+        try:
+            p.cleaned_data
+            self.fail('Attempts to access cleaned_data when validation fails should fail.')
+        except AttributeError:
+            pass
+        self.assertEqual(str(p), """<tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr>
+<tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr>
+<tr><th><label for="id_birthday">Birthday:</label></th><td><input type="text" name="birthday" id="id_birthday" /></td></tr>""")
+        self.assertEqual(p.as_table(), """<tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr>
+<tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr>
+<tr><th><label for="id_birthday">Birthday:</label></th><td><input type="text" name="birthday" id="id_birthday" /></td></tr>""")
+        self.assertEqual(p.as_ul(), """<li><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></li>
+<li><label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name" /></li>
+<li><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday" /></li>""")
+        self.assertEqual(p.as_p(), """<p><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></p>
+<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name" /></p>
+<p><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday" /></p>""")
+
+    def test_unicode_values(self):
+        # Unicode values are handled properly.
+        p = Person({'first_name': u'John', 'last_name': u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111', 'birthday': '1940-10-9'})
+        self.assertEqual(p.as_table(), u'<tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" value="John" id="id_first_name" /></td></tr>\n<tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></td></tr>\n<tr><th><label for="id_birthday">Birthday:</label></th><td><input type="text" name="birthday" value="1940-10-9" id="id_birthday" /></td></tr>')
+        self.assertEqual(p.as_ul(), u'<li><label for="id_first_name">First name:</label> <input type="text" name="first_name" value="John" id="id_first_name" /></li>\n<li><label for="id_last_name">Last name:</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></li>\n<li><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" value="1940-10-9" id="id_birthday" /></li>')
+        self.assertEqual(p.as_p(), u'<p><label for="id_first_name">First name:</label> <input type="text" name="first_name" value="John" id="id_first_name" /></p>\n<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></p>\n<p><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" value="1940-10-9" id="id_birthday" /></p>')
+
+        p = Person({'last_name': u'Lennon'})
+        self.assertEqual(p.errors['first_name'], [u'This field is required.'])
+        self.assertEqual(p.errors['birthday'], [u'This field is required.'])
+        self.assertFalse(p.is_valid())
+        self.assertEqual(p.errors.as_ul(), u'<ul class="errorlist"><li>first_name<ul class="errorlist"><li>This field is required.</li></ul></li><li>birthday<ul class="errorlist"><li>This field is required.</li></ul></li></ul>')
+        self.assertEqual(p.errors.as_text(), """* first_name
+  * This field is required.
+* birthday
+  * This field is required.""")
+        try:
+            p.cleaned_data
+            self.fail('Attempts to access cleaned_data when validation fails should fail.')
+        except AttributeError:
+            pass
+        self.assertEqual(p['first_name'].errors, [u'This field is required.'])
+        self.assertEqual(p['first_name'].errors.as_ul(), u'<ul class="errorlist"><li>This field is required.</li></ul>')
+        self.assertEqual(p['first_name'].errors.as_text(), u'* This field is required.')
+
+        p = Person()
+        self.assertEqual(str(p['first_name']), '<input type="text" name="first_name" id="id_first_name" />')
+        self.assertEqual(str(p['last_name']), '<input type="text" name="last_name" id="id_last_name" />')
+        self.assertEqual(str(p['birthday']), '<input type="text" name="birthday" id="id_birthday" />')
+
+    def test_cleaned_data_only_fields(self):
+        # cleaned_data will always *only* contain a key for fields defined in the
+        # Form, even if you pass extra data when you define the Form. In this
+        # example, we pass a bunch of extra fields to the form constructor,
+        # but cleaned_data contains only the form's fields.
+        data = {'first_name': u'John', 'last_name': u'Lennon', 'birthday': u'1940-10-9', 'extra1': 'hello', 'extra2': 'hello'}
+        p = Person(data)
+        self.assertTrue(p.is_valid())
+        self.assertEqual(p.cleaned_data['first_name'], u'John')
+        self.assertEqual(p.cleaned_data['last_name'], u'Lennon')
+        self.assertEqual(p.cleaned_data['birthday'], datetime.date(1940, 10, 9))
+
+    def test_optional_data(self):
+        # cleaned_data will include a key and value for *all* fields defined in the Form,
+        # even if the Form's data didn't include a value for fields that are not
+        # required. In this example, the data dictionary doesn't include a value for the
+        # "nick_name" field, but cleaned_data includes it. For CharFields, it's set to the
+        # empty string.
+        class OptionalPersonForm(Form):
+            first_name = CharField()
+            last_name = CharField()
+            nick_name = CharField(required=False)
+
+        data = {'first_name': u'John', 'last_name': u'Lennon'}
+        f = OptionalPersonForm(data)
+        self.assertTrue(f.is_valid())
+        self.assertEqual(f.cleaned_data['nick_name'], u'')
+        self.assertEqual(f.cleaned_data['first_name'], u'John')
+        self.assertEqual(f.cleaned_data['last_name'], u'Lennon')
+
+        # For DateFields, it's set to None.
+        class OptionalPersonForm(Form):
+            first_name = CharField()
+            last_name = CharField()
+            birth_date = DateField(required=False)
+
+        data = {'first_name': u'John', 'last_name': u'Lennon'}
+        f = OptionalPersonForm(data)
+        self.assertTrue(f.is_valid())
+        self.assertEqual(f.cleaned_data['birth_date'], None)
+        self.assertEqual(f.cleaned_data['first_name'], u'John')
+        self.assertEqual(f.cleaned_data['last_name'], u'Lennon')
+
+    def test_auto_id(self):
+        # "auto_id" tells the Form to add an "id" attribute to each form element.
+        # If it's a string that contains '%s', Django will use that as a format string
+        # into which the field's name will be inserted. It will also put a <label> around
+        # the human-readable labels for a field.
+        p = Person(auto_id='%s_id')
+        self.assertEqual(p.as_table(), """<tr><th><label for="first_name_id">First name:</label></th><td><input type="text" name="first_name" id="first_name_id" /></td></tr>
+<tr><th><label for="last_name_id">Last name:</label></th><td><input type="text" name="last_name" id="last_name_id" /></td></tr>
+<tr><th><label for="birthday_id">Birthday:</label></th><td><input type="text" name="birthday" id="birthday_id" /></td></tr>""")
+        self.assertEqual(p.as_ul(), """<li><label for="first_name_id">First name:</label> <input type="text" name="first_name" id="first_name_id" /></li>
+<li><label for="last_name_id">Last name:</label> <input type="text" name="last_name" id="last_name_id" /></li>
+<li><label for="birthday_id">Birthday:</label> <input type="text" name="birthday" id="birthday_id" /></li>""")
+        self.assertEqual(p.as_p(), """<p><label for="first_name_id">First name:</label> <input type="text" name="first_name" id="first_name_id" /></p>
+<p><label for="last_name_id">Last name:</label> <input type="text" name="last_name" id="last_name_id" /></p>
+<p><label for="birthday_id">Birthday:</label> <input type="text" name="birthday" id="birthday_id" /></p>""")
+
+    def test_auto_id_true(self):
+        # If auto_id is any True value whose str() does not contain '%s', the "id"
+        # attribute will be the name of the field.
+        p = Person(auto_id=True)
+        self.assertEqual(p.as_ul(), """<li><label for="first_name">First name:</label> <input type="text" name="first_name" id="first_name" /></li>
+<li><label for="last_name">Last name:</label> <input type="text" name="last_name" id="last_name" /></li>
+<li><label for="birthday">Birthday:</label> <input type="text" name="birthday" id="birthday" /></li>""")
+
+    def test_auto_id_false(self):
+        # If auto_id is any False value, an "id" attribute won't be output unless it
+        # was manually entered.
+        p = Person(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>First name: <input type="text" name="first_name" /></li>
+<li>Last name: <input type="text" name="last_name" /></li>
+<li>Birthday: <input type="text" name="birthday" /></li>""")
+
+    def test_id_on_field(self):
+        # In this example, auto_id is False, but the "id" attribute for the "first_name"
+        # field is given. Also note that field gets a <label>, while the others don't.
+        p = PersonNew(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li><label for="first_name_id">First name:</label> <input type="text" id="first_name_id" name="first_name" /></li>
+<li>Last name: <input type="text" name="last_name" /></li>
+<li>Birthday: <input type="text" name="birthday" /></li>""")
+
+    def test_auto_id_on_form_and_field(self):
+        # If the "id" attribute is specified in the Form and auto_id is True, the "id"
+        # attribute in the Form gets precedence.
+        p = PersonNew(auto_id=True)
+        self.assertEqual(p.as_ul(), """<li><label for="first_name_id">First name:</label> <input type="text" id="first_name_id" name="first_name" /></li>
+<li><label for="last_name">Last name:</label> <input type="text" name="last_name" id="last_name" /></li>
+<li><label for="birthday">Birthday:</label> <input type="text" name="birthday" id="birthday" /></li>""")
+
+    def test_various_boolean_values(self):
+        class SignupForm(Form):
+            email = EmailField()
+            get_spam = BooleanField()
+
+        f = SignupForm(auto_id=False)
+        self.assertEqual(str(f['email']), '<input type="text" name="email" />')
+        self.assertEqual(str(f['get_spam']), '<input type="checkbox" name="get_spam" />')
+
+        f = SignupForm({'email': 'test@example.com', 'get_spam': True}, auto_id=False)
+        self.assertEqual(str(f['email']), '<input type="text" name="email" value="test@example.com" />')
+        self.assertEqual(str(f['get_spam']), '<input checked="checked" type="checkbox" name="get_spam" />')
+
+        # 'True' or 'true' should be rendered without a value attribute
+        f = SignupForm({'email': 'test@example.com', 'get_spam': 'True'}, auto_id=False)
+        self.assertEqual(str(f['get_spam']), '<input checked="checked" type="checkbox" name="get_spam" />')
+
+        f = SignupForm({'email': 'test@example.com', 'get_spam': 'true'}, auto_id=False)
+        self.assertEqual(str(f['get_spam']), '<input checked="checked" type="checkbox" name="get_spam" />')
+
+        # A value of 'False' or 'false' should be rendered unchecked
+        f = SignupForm({'email': 'test@example.com', 'get_spam': 'False'}, auto_id=False)
+        self.assertEqual(str(f['get_spam']), '<input type="checkbox" name="get_spam" />')
+
+        f = SignupForm({'email': 'test@example.com', 'get_spam': 'false'}, auto_id=False)
+        self.assertEqual(str(f['get_spam']), '<input type="checkbox" name="get_spam" />')
+
+    def test_widget_output(self):
+        # Any Field can have a Widget class passed to its constructor:
+        class ContactForm(Form):
+            subject = CharField()
+            message = CharField(widget=Textarea)
+
+        f = ContactForm(auto_id=False)
+        self.assertEqual(str(f['subject']), '<input type="text" name="subject" />')
+        self.assertEqual(str(f['message']), '<textarea rows="10" cols="40" name="message"></textarea>')
+
+        # as_textarea(), as_text() and as_hidden() are shortcuts for changing the output
+        # widget type:
+        self.assertEqual(f['subject'].as_textarea(), u'<textarea rows="10" cols="40" name="subject"></textarea>')
+        self.assertEqual(f['message'].as_text(), u'<input type="text" name="message" />')
+        self.assertEqual(f['message'].as_hidden(), u'<input type="hidden" name="message" />')
+
+        # The 'widget' parameter to a Field can also be an instance:
+        class ContactForm(Form):
+            subject = CharField()
+            message = CharField(widget=Textarea(attrs={'rows': 80, 'cols': 20}))
+
+        f = ContactForm(auto_id=False)
+        self.assertEqual(str(f['message']), '<textarea rows="80" cols="20" name="message"></textarea>')
+
+        # Instance-level attrs are *not* carried over to as_textarea(), as_text() and
+        # as_hidden():
+        self.assertEqual(f['message'].as_text(), u'<input type="text" name="message" />')
+        f = ContactForm({'subject': 'Hello', 'message': 'I love you.'}, auto_id=False)
+        self.assertEqual(f['subject'].as_textarea(), u'<textarea rows="10" cols="40" name="subject">Hello</textarea>')
+        self.assertEqual(f['message'].as_text(), u'<input type="text" name="message" value="I love you." />')
+        self.assertEqual(f['message'].as_hidden(), u'<input type="hidden" name="message" value="I love you." />')
+
+    def test_forms_with_choices(self):
+        # For a form with a <select>, use ChoiceField:
+        class FrameworkForm(Form):
+            name = CharField()
+            language = ChoiceField(choices=[('P', 'Python'), ('J', 'Java')])
+
+        f = FrameworkForm(auto_id=False)
+        self.assertEqual(str(f['language']), """<select name="language">
+<option value="P">Python</option>
+<option value="J">Java</option>
+</select>""")
+        f = FrameworkForm({'name': 'Django', 'language': 'P'}, auto_id=False)
+        self.assertEqual(str(f['language']), """<select name="language">
+<option value="P" selected="selected">Python</option>
+<option value="J">Java</option>
+</select>""")
+
+        # A subtlety: If one of the choices' value is the empty string and the form is
+        # unbound, then the <option> for the empty-string choice will get selected="selected".
+        class FrameworkForm(Form):
+            name = CharField()
+            language = ChoiceField(choices=[('', '------'), ('P', 'Python'), ('J', 'Java')])
+
+        f = FrameworkForm(auto_id=False)
+        self.assertEqual(str(f['language']), """<select name="language">
+<option value="" selected="selected">------</option>
+<option value="P">Python</option>
+<option value="J">Java</option>
+</select>""")
+
+        # You can specify widget attributes in the Widget constructor.
+        class FrameworkForm(Form):
+            name = CharField()
+            language = ChoiceField(choices=[('P', 'Python'), ('J', 'Java')], widget=Select(attrs={'class': 'foo'}))
+
+        f = FrameworkForm(auto_id=False)
+        self.assertEqual(str(f['language']), """<select class="foo" name="language">
+<option value="P">Python</option>
+<option value="J">Java</option>
+</select>""")
+        f = FrameworkForm({'name': 'Django', 'language': 'P'}, auto_id=False)
+        self.assertEqual(str(f['language']), """<select class="foo" name="language">
+<option value="P" selected="selected">Python</option>
+<option value="J">Java</option>
+</select>""")
+
+        # When passing a custom widget instance to ChoiceField, note that setting
+        # 'choices' on the widget is meaningless. The widget will use the choices
+        # defined on the Field, not the ones defined on the Widget.
+        class FrameworkForm(Form):
+            name = CharField()
+            language = ChoiceField(choices=[('P', 'Python'), ('J', 'Java')], widget=Select(choices=[('R', 'Ruby'), ('P', 'Perl')], attrs={'class': 'foo'}))
+
+        f = FrameworkForm(auto_id=False)
+        self.assertEqual(str(f['language']), """<select class="foo" name="language">
+<option value="P">Python</option>
+<option value="J">Java</option>
+</select>""")
+        f = FrameworkForm({'name': 'Django', 'language': 'P'}, auto_id=False)
+        self.assertEqual(str(f['language']), """<select class="foo" name="language">
+<option value="P" selected="selected">Python</option>
+<option value="J">Java</option>
+</select>""")
+
+        # You can set a ChoiceField's choices after the fact.
+        class FrameworkForm(Form):
+            name = CharField()
+            language = ChoiceField()
+
+        f = FrameworkForm(auto_id=False)
+        self.assertEqual(str(f['language']), """<select name="language">
+</select>""")
+        f.fields['language'].choices = [('P', 'Python'), ('J', 'Java')]
+        self.assertEqual(str(f['language']), """<select name="language">
+<option value="P">Python</option>
+<option value="J">Java</option>
+</select>""")
+
+    def test_forms_with_radio(self):
+        # Add widget=RadioSelect to use that widget with a ChoiceField.
+        class FrameworkForm(Form):
+            name = CharField()
+            language = ChoiceField(choices=[('P', 'Python'), ('J', 'Java')], widget=RadioSelect)
+
+        f = FrameworkForm(auto_id=False)
+        self.assertEqual(str(f['language']), """<ul>
+<li><label><input type="radio" name="language" value="P" /> Python</label></li>
+<li><label><input type="radio" name="language" value="J" /> Java</label></li>
+</ul>""")
+        self.assertEqual(f.as_table(), """<tr><th>Name:</th><td><input type="text" name="name" /></td></tr>
+<tr><th>Language:</th><td><ul>
+<li><label><input type="radio" name="language" value="P" /> Python</label></li>
+<li><label><input type="radio" name="language" value="J" /> Java</label></li>
+</ul></td></tr>""")
+        self.assertEqual(f.as_ul(), """<li>Name: <input type="text" name="name" /></li>
+<li>Language: <ul>
+<li><label><input type="radio" name="language" value="P" /> Python</label></li>
+<li><label><input type="radio" name="language" value="J" /> Java</label></li>
+</ul></li>""")
+
+        # Regarding auto_id and <label>, RadioSelect is a special case. Each radio button
+        # gets a distinct ID, formed by appending an underscore plus the button's
+        # zero-based index.
+        f = FrameworkForm(auto_id='id_%s')
+        self.assertEqual(str(f['language']), """<ul>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+</ul>""")
+
+        # When RadioSelect is used with auto_id, and the whole form is printed using
+        # either as_table() or as_ul(), the label for the RadioSelect will point to the
+        # ID of the *first* radio button.
+        self.assertEqual(f.as_table(), """<tr><th><label for="id_name">Name:</label></th><td><input type="text" name="name" id="id_name" /></td></tr>
+<tr><th><label for="id_language_0">Language:</label></th><td><ul>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+</ul></td></tr>""")
+        self.assertEqual(f.as_ul(), """<li><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></li>
+<li><label for="id_language_0">Language:</label> <ul>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+</ul></li>""")
+        self.assertEqual(f.as_p(), """<p><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></p>
+<p><label for="id_language_0">Language:</label> <ul>
+<li><label for="id_language_0"><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
+<li><label for="id_language_1"><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
+</ul></p>""")
+
+    def test_forms_wit_hmultiple_choice(self):
+        # MultipleChoiceField is a special case, as its data is required to be a list:
+        class SongForm(Form):
+            name = CharField()
+            composers = MultipleChoiceField()
+
+        f = SongForm(auto_id=False)
+        self.assertEqual(str(f['composers']), """<select multiple="multiple" name="composers">
+</select>""")
+
+        class SongForm(Form):
+            name = CharField()
+            composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')])
+
+        f = SongForm(auto_id=False)
+        self.assertEqual(str(f['composers']), """<select multiple="multiple" name="composers">
+<option value="J">John Lennon</option>
+<option value="P">Paul McCartney</option>
+</select>""")
+        f = SongForm({'name': 'Yesterday', 'composers': ['P']}, auto_id=False)
+        self.assertEqual(str(f['name']), '<input type="text" name="name" value="Yesterday" />')
+        self.assertEqual(str(f['composers']), """<select multiple="multiple" name="composers">
+<option value="J">John Lennon</option>
+<option value="P" selected="selected">Paul McCartney</option>
+</select>""")
+
+    def test_hidden_data(self):
+        class SongForm(Form):
+            name = CharField()
+            composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')])
+
+        # MultipleChoiceField rendered as_hidden() is a special case. Because it can
+        # have multiple values, its as_hidden() renders multiple <input type="hidden">
+        # tags.
+        f = SongForm({'name': 'Yesterday', 'composers': ['P']}, auto_id=False)
+        self.assertEqual(f['composers'].as_hidden(), '<input type="hidden" name="composers" value="P" />')
+        f = SongForm({'name': 'From Me To You', 'composers': ['P', 'J']}, auto_id=False)
+        self.assertEqual(f['composers'].as_hidden(), """<input type="hidden" name="composers" value="P" />
+<input type="hidden" name="composers" value="J" />""")
+
+    def test_mulitple_choice_checkbox(self):
+        # MultipleChoiceField can also be used with the CheckboxSelectMultiple widget.
+        class SongForm(Form):
+            name = CharField()
+            composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=CheckboxSelectMultiple)
+
+        f = SongForm(auto_id=False)
+        self.assertEqual(str(f['composers']), """<ul>
+<li><label><input type="checkbox" name="composers" value="J" /> John Lennon</label></li>
+<li><label><input type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
+</ul>""")
+        f = SongForm({'composers': ['J']}, auto_id=False)
+        self.assertEqual(str(f['composers']), """<ul>
+<li><label><input checked="checked" type="checkbox" name="composers" value="J" /> John Lennon</label></li>
+<li><label><input type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
+</ul>""")
+        f = SongForm({'composers': ['J', 'P']}, auto_id=False)
+        self.assertEqual(str(f['composers']), """<ul>
+<li><label><input checked="checked" type="checkbox" name="composers" value="J" /> John Lennon</label></li>
+<li><label><input checked="checked" type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
+</ul>""")
+
+    def test_checkbox_auto_id(self):
+        # Regarding auto_id, CheckboxSelectMultiple is a special case. Each checkbox
+        # gets a distinct ID, formed by appending an underscore plus the checkbox's
+        # zero-based index.
+        class SongForm(Form):
+            name = CharField()
+            composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=CheckboxSelectMultiple)
+
+        f = SongForm(auto_id='%s_id')
+        self.assertEqual(str(f['composers']), """<ul>
+<li><label for="composers_id_0"><input type="checkbox" name="composers" value="J" id="composers_id_0" /> John Lennon</label></li>
+<li><label for="composers_id_1"><input type="checkbox" name="composers" value="P" id="composers_id_1" /> Paul McCartney</label></li>
+</ul>""")
+
+    def test_multiple_choice_list_data(self):
+        # Data for a MultipleChoiceField should be a list. QueryDict, MultiValueDict and
+        # MergeDict (when created as a merge of MultiValueDicts) conveniently work with
+        # this.
+        class SongForm(Form):
+            name = CharField()
+            composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=CheckboxSelectMultiple)
+
+        data = {'name': 'Yesterday', 'composers': ['J', 'P']}
+        f = SongForm(data)
+        self.assertEqual(f.errors, {})
+
+        data = QueryDict('name=Yesterday&composers=J&composers=P')
+        f = SongForm(data)
+        self.assertEqual(f.errors, {})
+
+        data = MultiValueDict(dict(name=['Yesterday'], composers=['J', 'P']))
+        f = SongForm(data)
+        self.assertEqual(f.errors, {})
+
+        data = MergeDict(MultiValueDict(dict(name=['Yesterday'], composers=['J', 'P'])))
+        f = SongForm(data)
+        self.assertEqual(f.errors, {})
+
+    def test_multiple_hidden(self):
+        class SongForm(Form):
+            name = CharField()
+            composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=CheckboxSelectMultiple)
+
+        # The MultipleHiddenInput widget renders multiple values as hidden fields.
+        class SongFormHidden(Form):
+            name = CharField()
+            composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=MultipleHiddenInput)
+
+        f = SongFormHidden(MultiValueDict(dict(name=['Yesterday'], composers=['J', 'P'])), auto_id=False)
+        self.assertEqual(f.as_ul(), """<li>Name: <input type="text" name="name" value="Yesterday" /><input type="hidden" name="composers" value="J" />
+<input type="hidden" name="composers" value="P" /></li>""")
+
+        # When using CheckboxSelectMultiple, the framework expects a list of input and
+        # returns a list of input.
+        f = SongForm({'name': 'Yesterday'}, auto_id=False)
+        self.assertEqual(f.errors['composers'], [u'This field is required.'])
+        f = SongForm({'name': 'Yesterday', 'composers': ['J']}, auto_id=False)
+        self.assertEqual(f.errors, {})
+        self.assertEqual(f.cleaned_data['composers'], [u'J'])
+        self.assertEqual(f.cleaned_data['name'], u'Yesterday')
+        f = SongForm({'name': 'Yesterday', 'composers': ['J', 'P']}, auto_id=False)
+        self.assertEqual(f.errors, {})
+        self.assertEqual(f.cleaned_data['composers'], [u'J', u'P'])
+        self.assertEqual(f.cleaned_data['name'], u'Yesterday')
+
+    def test_escaping(self):
+        # Validation errors are HTML-escaped when output as HTML.
+        class EscapingForm(Form):
+            special_name = CharField(label="<em>Special</em> Field")
+            special_safe_name = CharField(label=mark_safe("<em>Special</em> Field"))
+
+            def clean_special_name(self):
+                raise ValidationError("Something's wrong with '%s'" % self.cleaned_data['special_name'])
+
+            def clean_special_safe_name(self):
+                raise ValidationError(mark_safe("'<b>%s</b>' is a safe string" % self.cleaned_data['special_safe_name']))
+
+        f = EscapingForm({'special_name': "Nothing to escape", 'special_safe_name': "Nothing to escape"}, auto_id=False)
+        self.assertEqual(f.as_table(), """<tr><th>&lt;em&gt;Special&lt;/em&gt; Field:</th><td><ul class="errorlist"><li>Something&#39;s wrong with &#39;Nothing to escape&#39;</li></ul><input type="text" name="special_name" value="Nothing to escape" /></td></tr>
+<tr><th><em>Special</em> Field:</th><td><ul class="errorlist"><li>'<b>Nothing to escape</b>' is a safe string</li></ul><input type="text" name="special_safe_name" value="Nothing to escape" /></td></tr>""")
+        f = EscapingForm({
+            'special_name': "Should escape < & > and <script>alert('xss')</script>",
+            'special_safe_name': "<i>Do not escape</i>"
+        }, auto_id=False)
+        self.assertEqual(f.as_table(), """<tr><th>&lt;em&gt;Special&lt;/em&gt; Field:</th><td><ul class="errorlist"><li>Something&#39;s wrong with &#39;Should escape &lt; &amp; &gt; and &lt;script&gt;alert(&#39;xss&#39;)&lt;/script&gt;&#39;</li></ul><input type="text" name="special_name" value="Should escape &lt; &amp; &gt; and &lt;script&gt;alert(&#39;xss&#39;)&lt;/script&gt;" /></td></tr>
+<tr><th><em>Special</em> Field:</th><td><ul class="errorlist"><li>'<b><i>Do not escape</i></b>' is a safe string</li></ul><input type="text" name="special_safe_name" value="&lt;i&gt;Do not escape&lt;/i&gt;" /></td></tr>""")
+
+    def test_validating_multiple_fields(self):
+        # There are a couple of ways to do multiple-field validation. If you want the
+        # validation message to be associated with a particular field, implement the
+        # clean_XXX() method on the Form, where XXX is the field name. As in
+        # Field.clean(), the clean_XXX() method should return the cleaned value. In the
+        # clean_XXX() method, you have access to self.cleaned_data, which is a dictionary
+        # of all the data that has been cleaned *so far*, in order by the fields,
+        # including the current field (e.g., the field XXX if you're in clean_XXX()).
+        class UserRegistration(Form):
+            username = CharField(max_length=10)
+            password1 = CharField(widget=PasswordInput)
+            password2 = CharField(widget=PasswordInput)
+
+            def clean_password2(self):
+                if self.cleaned_data.get('password1') and self.cleaned_data.get('password2') and self.cleaned_data['password1'] != self.cleaned_data['password2']:
+                    raise ValidationError(u'Please make sure your passwords match.')
+
+                return self.cleaned_data['password2']
+
+        f = UserRegistration(auto_id=False)
+        self.assertEqual(f.errors, {})
+        f = UserRegistration({}, auto_id=False)
+        self.assertEqual(f.errors['username'], [u'This field is required.'])
+        self.assertEqual(f.errors['password1'], [u'This field is required.'])
+        self.assertEqual(f.errors['password2'], [u'This field is required.'])
+        f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'bar'}, auto_id=False)
+        self.assertEqual(f.errors['password2'], [u'Please make sure your passwords match.'])
+        f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'foo'}, auto_id=False)
+        self.assertEqual(f.errors, {})
+        self.assertEqual(f.cleaned_data['username'], u'adrian')
+        self.assertEqual(f.cleaned_data['password1'], u'foo')
+        self.assertEqual(f.cleaned_data['password2'], u'foo')
+
+        # Another way of doing multiple-field validation is by implementing the
+        # Form's clean() method. If you do this, any ValidationError raised by that
+        # method will not be associated with a particular field; it will have a
+        # special-case association with the field named '__all__'.
+        # Note that in Form.clean(), you have access to self.cleaned_data, a dictionary of
+        # all the fields/values that have *not* raised a ValidationError. Also note
+        # Form.clean() is required to return a dictionary of all clean data.
+        class UserRegistration(Form):
+            username = CharField(max_length=10)
+            password1 = CharField(widget=PasswordInput)
+            password2 = CharField(widget=PasswordInput)
+
+            def clean(self):
+                if self.cleaned_data.get('password1') and self.cleaned_data.get('password2') and self.cleaned_data['password1'] != self.cleaned_data['password2']:
+                    raise ValidationError(u'Please make sure your passwords match.')
+
+                return self.cleaned_data
+
+        f = UserRegistration(auto_id=False)
+        self.assertEqual(f.errors, {})
+        f = UserRegistration({}, auto_id=False)
+        self.assertEqual(f.as_table(), """<tr><th>Username:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="username" maxlength="10" /></td></tr>
+<tr><th>Password1:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="password" name="password1" /></td></tr>
+<tr><th>Password2:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="password" name="password2" /></td></tr>""")
+        self.assertEqual(f.errors['username'], [u'This field is required.'])
+        self.assertEqual(f.errors['password1'], [u'This field is required.'])
+        self.assertEqual(f.errors['password2'], [u'This field is required.'])
+        f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'bar'}, auto_id=False)
+        self.assertEqual(f.errors['__all__'], [u'Please make sure your passwords match.'])
+        self.assertEqual(f.as_table(), """<tr><td colspan="2"><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></td></tr>
+<tr><th>Username:</th><td><input type="text" name="username" value="adrian" maxlength="10" /></td></tr>
+<tr><th>Password1:</th><td><input type="password" name="password1" value="foo" /></td></tr>
+<tr><th>Password2:</th><td><input type="password" name="password2" value="bar" /></td></tr>""")
+        self.assertEqual(f.as_ul(), """<li><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></li>
+<li>Username: <input type="text" name="username" value="adrian" maxlength="10" /></li>
+<li>Password1: <input type="password" name="password1" value="foo" /></li>
+<li>Password2: <input type="password" name="password2" value="bar" /></li>""")
+        f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'foo'}, auto_id=False)
+        self.assertEqual(f.errors, {})
+        self.assertEqual(f.cleaned_data['username'], u'adrian')
+        self.assertEqual(f.cleaned_data['password1'], u'foo')
+        self.assertEqual(f.cleaned_data['password2'], u'foo')
+
+    def test_dynamic_construction(self):
+        # It's possible to construct a Form dynamically by adding to the self.fields
+        # dictionary in __init__(). Don't forget to call Form.__init__() within the
+        # subclass' __init__().
+        class Person(Form):
+            first_name = CharField()
+            last_name = CharField()
+
+            def __init__(self, *args, **kwargs):
+                super(Person, self).__init__(*args, **kwargs)
+                self.fields['birthday'] = DateField()
+
+        p = Person(auto_id=False)
+        self.assertEqual(p.as_table(), """<tr><th>First name:</th><td><input type="text" name="first_name" /></td></tr>
+<tr><th>Last name:</th><td><input type="text" name="last_name" /></td></tr>
+<tr><th>Birthday:</th><td><input type="text" name="birthday" /></td></tr>""")
+
+        # Instances of a dynamic Form do not persist fields from one Form instance to
+        # the next.
+        class MyForm(Form):
+            def __init__(self, data=None, auto_id=False, field_list=[]):
+                Form.__init__(self, data, auto_id=auto_id)
+
+                for field in field_list:
+                    self.fields[field[0]] = field[1]
+
+        field_list = [('field1', CharField()), ('field2', CharField())]
+        my_form = MyForm(field_list=field_list)
+        self.assertEqual(my_form.as_table(), """<tr><th>Field1:</th><td><input type="text" name="field1" /></td></tr>
+<tr><th>Field2:</th><td><input type="text" name="field2" /></td></tr>""")
+        field_list = [('field3', CharField()), ('field4', CharField())]
+        my_form = MyForm(field_list=field_list)
+        self.assertEqual(my_form.as_table(), """<tr><th>Field3:</th><td><input type="text" name="field3" /></td></tr>
+<tr><th>Field4:</th><td><input type="text" name="field4" /></td></tr>""")
+
+        class MyForm(Form):
+            default_field_1 = CharField()
+            default_field_2 = CharField()
+
+            def __init__(self, data=None, auto_id=False, field_list=[]):
+                Form.__init__(self, data, auto_id=auto_id)
+
+                for field in field_list:
+                    self.fields[field[0]] = field[1]
+
+        field_list = [('field1', CharField()), ('field2', CharField())]
+        my_form = MyForm(field_list=field_list)
+        self.assertEqual(my_form.as_table(), """<tr><th>Default field 1:</th><td><input type="text" name="default_field_1" /></td></tr>
+<tr><th>Default field 2:</th><td><input type="text" name="default_field_2" /></td></tr>
+<tr><th>Field1:</th><td><input type="text" name="field1" /></td></tr>
+<tr><th>Field2:</th><td><input type="text" name="field2" /></td></tr>""")
+        field_list = [('field3', CharField()), ('field4', CharField())]
+        my_form = MyForm(field_list=field_list)
+        self.assertEqual(my_form.as_table(), """<tr><th>Default field 1:</th><td><input type="text" name="default_field_1" /></td></tr>
+<tr><th>Default field 2:</th><td><input type="text" name="default_field_2" /></td></tr>
+<tr><th>Field3:</th><td><input type="text" name="field3" /></td></tr>
+<tr><th>Field4:</th><td><input type="text" name="field4" /></td></tr>""")
+
+        # Similarly, changes to field attributes do not persist from one Form instance
+        # to the next.
+        class Person(Form):
+            first_name = CharField(required=False)
+            last_name = CharField(required=False)
+
+            def __init__(self, names_required=False, *args, **kwargs):
+                super(Person, self).__init__(*args, **kwargs)
+
+                if names_required:
+                    self.fields['first_name'].required = True
+                    self.fields['first_name'].widget.attrs['class'] = 'required'
+                    self.fields['last_name'].required = True
+                    self.fields['last_name'].widget.attrs['class'] = 'required'
+
+        f = Person(names_required=False)
+        self.assertEqual(f['first_name'].field.required, f['last_name'].field.required, (False, False))
+        self.assertEqual(f['first_name'].field.widget.attrs, f['last_name'].field.widget.attrs, ({}, {}))
+        f = Person(names_required=True)
+        self.assertEqual(f['first_name'].field.required, f['last_name'].field.required, (True, True))
+        self.assertEqual(f['first_name'].field.widget.attrs, f['last_name'].field.widget.attrs, ({'class': 'required'}, {'class': 'required'}))
+        f = Person(names_required=False)
+        self.assertEqual(f['first_name'].field.required, f['last_name'].field.required, (False, False))
+        self.assertEqual(f['first_name'].field.widget.attrs, f['last_name'].field.widget.attrs, ({}, {}))
+
+        class Person(Form):
+            first_name = CharField(max_length=30)
+            last_name = CharField(max_length=30)
+
+            def __init__(self, name_max_length=None, *args, **kwargs):
+                super(Person, self).__init__(*args, **kwargs)
+
+                if name_max_length:
+                    self.fields['first_name'].max_length = name_max_length
+                    self.fields['last_name'].max_length = name_max_length
+
+        f = Person(name_max_length=None)
+        self.assertEqual(f['first_name'].field.max_length, f['last_name'].field.max_length, (30, 30))
+        f = Person(name_max_length=20)
+        self.assertEqual(f['first_name'].field.max_length, f['last_name'].field.max_length, (20, 20))
+        f = Person(name_max_length=None)
+        self.assertEqual(f['first_name'].field.max_length, f['last_name'].field.max_length, (30, 30))
+
+    def test_hidden_widget(self):
+        # HiddenInput widgets are displayed differently in the as_table(), as_ul())
+        # and as_p() output of a Form -- their verbose names are not displayed, and a
+        # separate row is not displayed. They're displayed in the last row of the
+        # form, directly after that row's form element.
+        class Person(Form):
+            first_name = CharField()
+            last_name = CharField()
+            hidden_text = CharField(widget=HiddenInput)
+            birthday = DateField()
+
+        p = Person(auto_id=False)
+        self.assertEqual(p.as_table(), """<tr><th>First name:</th><td><input type="text" name="first_name" /></td></tr>
+<tr><th>Last name:</th><td><input type="text" name="last_name" /></td></tr>
+<tr><th>Birthday:</th><td><input type="text" name="birthday" /><input type="hidden" name="hidden_text" /></td></tr>""")
+        self.assertEqual(p.as_ul(), """<li>First name: <input type="text" name="first_name" /></li>
+<li>Last name: <input type="text" name="last_name" /></li>
+<li>Birthday: <input type="text" name="birthday" /><input type="hidden" name="hidden_text" /></li>""")
+        self.assertEqual(p.as_p(), """<p>First name: <input type="text" name="first_name" /></p>
+<p>Last name: <input type="text" name="last_name" /></p>
+<p>Birthday: <input type="text" name="birthday" /><input type="hidden" name="hidden_text" /></p>""")
+
+        # With auto_id set, a HiddenInput still gets an ID, but it doesn't get a label.
+        p = Person(auto_id='id_%s')
+        self.assertEqual(p.as_table(), """<tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr>
+<tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr>
+<tr><th><label for="id_birthday">Birthday:</label></th><td><input type="text" name="birthday" id="id_birthday" /><input type="hidden" name="hidden_text" id="id_hidden_text" /></td></tr>""")
+        self.assertEqual(p.as_ul(), """<li><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></li>
+<li><label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name" /></li>
+<li><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday" /><input type="hidden" name="hidden_text" id="id_hidden_text" /></li>""")
+        self.assertEqual(p.as_p(), """<p><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></p>
+<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name" /></p>
+<p><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday" /><input type="hidden" name="hidden_text" id="id_hidden_text" /></p>""")
+
+        # If a field with a HiddenInput has errors, the as_table() and as_ul() output
+        # will include the error message(s) with the text "(Hidden field [fieldname]) "
+        # prepended. This message is displayed at the top of the output, regardless of
+        # its field's order in the form.
+        p = Person({'first_name': 'John', 'last_name': 'Lennon', 'birthday': '1940-10-9'}, auto_id=False)
+        self.assertEqual(p.as_table(), """<tr><td colspan="2"><ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul></td></tr>
+<tr><th>First name:</th><td><input type="text" name="first_name" value="John" /></td></tr>
+<tr><th>Last name:</th><td><input type="text" name="last_name" value="Lennon" /></td></tr>
+<tr><th>Birthday:</th><td><input type="text" name="birthday" value="1940-10-9" /><input type="hidden" name="hidden_text" /></td></tr>""")
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul></li>
+<li>First name: <input type="text" name="first_name" value="John" /></li>
+<li>Last name: <input type="text" name="last_name" value="Lennon" /></li>
+<li>Birthday: <input type="text" name="birthday" value="1940-10-9" /><input type="hidden" name="hidden_text" /></li>""")
+        self.assertEqual(p.as_p(), """<ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul>
+<p>First name: <input type="text" name="first_name" value="John" /></p>
+<p>Last name: <input type="text" name="last_name" value="Lennon" /></p>
+<p>Birthday: <input type="text" name="birthday" value="1940-10-9" /><input type="hidden" name="hidden_text" /></p>""")
+
+        # A corner case: It's possible for a form to have only HiddenInputs.
+        class TestForm(Form):
+            foo = CharField(widget=HiddenInput)
+            bar = CharField(widget=HiddenInput)
+
+        p = TestForm(auto_id=False)
+        self.assertEqual(p.as_table(), '<input type="hidden" name="foo" /><input type="hidden" name="bar" />')
+        self.assertEqual(p.as_ul(), '<input type="hidden" name="foo" /><input type="hidden" name="bar" />')
+        self.assertEqual(p.as_p(), '<input type="hidden" name="foo" /><input type="hidden" name="bar" />')
+
+    def test_field_order(self):
+        # A Form's fields are displayed in the same order in which they were defined.
+        class TestForm(Form):
+            field1 = CharField()
+            field2 = CharField()
+            field3 = CharField()
+            field4 = CharField()
+            field5 = CharField()
+            field6 = CharField()
+            field7 = CharField()
+            field8 = CharField()
+            field9 = CharField()
+            field10 = CharField()
+            field11 = CharField()
+            field12 = CharField()
+            field13 = CharField()
+            field14 = CharField()
+
+        p = TestForm(auto_id=False)
+        self.assertEqual(p.as_table(), """<tr><th>Field1:</th><td><input type="text" name="field1" /></td></tr>
+<tr><th>Field2:</th><td><input type="text" name="field2" /></td></tr>
+<tr><th>Field3:</th><td><input type="text" name="field3" /></td></tr>
+<tr><th>Field4:</th><td><input type="text" name="field4" /></td></tr>
+<tr><th>Field5:</th><td><input type="text" name="field5" /></td></tr>
+<tr><th>Field6:</th><td><input type="text" name="field6" /></td></tr>
+<tr><th>Field7:</th><td><input type="text" name="field7" /></td></tr>
+<tr><th>Field8:</th><td><input type="text" name="field8" /></td></tr>
+<tr><th>Field9:</th><td><input type="text" name="field9" /></td></tr>
+<tr><th>Field10:</th><td><input type="text" name="field10" /></td></tr>
+<tr><th>Field11:</th><td><input type="text" name="field11" /></td></tr>
+<tr><th>Field12:</th><td><input type="text" name="field12" /></td></tr>
+<tr><th>Field13:</th><td><input type="text" name="field13" /></td></tr>
+<tr><th>Field14:</th><td><input type="text" name="field14" /></td></tr>""")
+
+    def test_form_html_attributes(self):
+        # Some Field classes have an effect on the HTML attributes of their associated
+        # Widget. If you set max_length in a CharField and its associated widget is
+        # either a TextInput or PasswordInput, then the widget's rendered HTML will
+        # include the "maxlength" attribute.
+        class UserRegistration(Form):
+            username = CharField(max_length=10)                   # uses TextInput by default
+            password = CharField(max_length=10, widget=PasswordInput)
+            realname = CharField(max_length=10, widget=TextInput) # redundantly define widget, just to test
+            address = CharField()                                 # no max_length defined here
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" maxlength="10" /></li>
+<li>Realname: <input type="text" name="realname" maxlength="10" /></li>
+<li>Address: <input type="text" name="address" /></li>""")
+
+        # If you specify a custom "attrs" that includes the "maxlength" attribute,
+        # the Field's max_length attribute will override whatever "maxlength" you specify
+        # in "attrs".
+        class UserRegistration(Form):
+            username = CharField(max_length=10, widget=TextInput(attrs={'maxlength': 20}))
+            password = CharField(max_length=10, widget=PasswordInput)
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" maxlength="10" /></li>""")
+
+    def test_specifying_labels(self):
+        # You can specify the label for a field by using the 'label' argument to a Field
+        # class. If you don't specify 'label', Django will use the field name with
+        # underscores converted to spaces, and the initial letter capitalized.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, label='Your username')
+            password1 = CharField(widget=PasswordInput)
+            password2 = CharField(widget=PasswordInput, label='Password (again)')
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Your username: <input type="text" name="username" maxlength="10" /></li>
+<li>Password1: <input type="password" name="password1" /></li>
+<li>Password (again): <input type="password" name="password2" /></li>""")
+
+        # Labels for as_* methods will only end in a colon if they don't end in other
+        # punctuation already.
+        class Questions(Form):
+            q1 = CharField(label='The first question')
+            q2 = CharField(label='What is your name?')
+            q3 = CharField(label='The answer to life is:')
+            q4 = CharField(label='Answer this question!')
+            q5 = CharField(label='The last question. Period.')
+
+        self.assertEqual(Questions(auto_id=False).as_p(), """<p>The first question: <input type="text" name="q1" /></p>
+<p>What is your name? <input type="text" name="q2" /></p>
+<p>The answer to life is: <input type="text" name="q3" /></p>
+<p>Answer this question! <input type="text" name="q4" /></p>
+<p>The last question. Period. <input type="text" name="q5" /></p>""")
+        self.assertEqual(Questions().as_p(), """<p><label for="id_q1">The first question:</label> <input type="text" name="q1" id="id_q1" /></p>
+<p><label for="id_q2">What is your name?</label> <input type="text" name="q2" id="id_q2" /></p>
+<p><label for="id_q3">The answer to life is:</label> <input type="text" name="q3" id="id_q3" /></p>
+<p><label for="id_q4">Answer this question!</label> <input type="text" name="q4" id="id_q4" /></p>
+<p><label for="id_q5">The last question. Period.</label> <input type="text" name="q5" id="id_q5" /></p>""")
+
+        # A label can be a Unicode object or a bytestring with special characters.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, label='ŠĐĆŽćžšđ')
+            password = CharField(widget=PasswordInput, label=u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111')
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), u'<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111: <input type="text" name="username" maxlength="10" /></li>\n<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111: <input type="password" name="password" /></li>')
+
+        # If a label is set to the empty string for a field, that field won't get a label.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, label='')
+            password = CharField(widget=PasswordInput)
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li> <input type="text" name="username" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>""")
+        p = UserRegistration(auto_id='id_%s')
+        self.assertEqual(p.as_ul(), """<li> <input id="id_username" type="text" name="username" maxlength="10" /></li>
+<li><label for="id_password">Password:</label> <input type="password" name="password" id="id_password" /></li>""")
+
+        # If label is None, Django will auto-create the label from the field name. This
+        # is default behavior.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, label=None)
+            password = CharField(widget=PasswordInput)
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>""")
+        p = UserRegistration(auto_id='id_%s')
+        self.assertEqual(p.as_ul(), """<li><label for="id_username">Username:</label> <input id="id_username" type="text" name="username" maxlength="10" /></li>
+<li><label for="id_password">Password:</label> <input type="password" name="password" id="id_password" /></li>""")
+
+    def test_label_suffix(self):
+        # You can specify the 'label_suffix' argument to a Form class to modify the
+        # punctuation symbol used at the end of a label.  By default, the colon (:) is
+        # used, and is only appended to the label if the label doesn't already end with a
+        # punctuation symbol: ., !, ? or :.  If you specify a different suffix, it will
+        # be appended regardless of the last character of the label.
+        class FavoriteForm(Form):
+            color = CharField(label='Favorite color?')
+            animal = CharField(label='Favorite animal')
+
+        f = FavoriteForm(auto_id=False)
+        self.assertEqual(f.as_ul(), """<li>Favorite color? <input type="text" name="color" /></li>
+<li>Favorite animal: <input type="text" name="animal" /></li>""")
+        f = FavoriteForm(auto_id=False, label_suffix='?')
+        self.assertEqual(f.as_ul(), """<li>Favorite color? <input type="text" name="color" /></li>
+<li>Favorite animal? <input type="text" name="animal" /></li>""")
+        f = FavoriteForm(auto_id=False, label_suffix='')
+        self.assertEqual(f.as_ul(), """<li>Favorite color? <input type="text" name="color" /></li>
+<li>Favorite animal <input type="text" name="animal" /></li>""")
+        f = FavoriteForm(auto_id=False, label_suffix=u'\u2192')
+        self.assertEqual(f.as_ul(), u'<li>Favorite color? <input type="text" name="color" /></li>\n<li>Favorite animal\u2192 <input type="text" name="animal" /></li>')
+
+    def test_initial_data(self):
+        # You can specify initial data for a field by using the 'initial' argument to a
+        # Field class. This initial data is displayed when a Form is rendered with *no*
+        # data. It is not displayed when a Form is rendered with any data (including an
+        # empty dictionary). Also, the initial value is *not* used if data for a
+        # particular required field isn't provided.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, initial='django')
+            password = CharField(widget=PasswordInput)
+
+        # Here, we're not submitting any data, so the initial value will be displayed.)
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="django" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>""")
+
+        # Here, we're submitting data, so the initial value will *not* be displayed.
+        p = UserRegistration({}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>This field is required.</li></ul>Username: <input type="text" name="username" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>""")
+        p = UserRegistration({'username': u''}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>This field is required.</li></ul>Username: <input type="text" name="username" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>""")
+        p = UserRegistration({'username': u'foo'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="foo" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>""")
+
+        # An 'initial' value is *not* used as a fallback if data is not provided. In this
+        # example, we don't provide a value for 'username', and the form raises a
+        # validation error rather than using the initial value for 'username'.
+        p = UserRegistration({'password': 'secret'})
+        self.assertEqual(p.errors['username'], [u'This field is required.'])
+        self.assertFalse(p.is_valid())
+
+    def test_dynamic_initial_data(self):
+        # The previous technique dealt with "hard-coded" initial data, but it's also
+        # possible to specify initial data after you've already created the Form class
+        # (i.e., at runtime). Use the 'initial' parameter to the Form constructor. This
+        # should be a dictionary containing initial values for one or more fields in the
+        # form, keyed by field name.
+        class UserRegistration(Form):
+            username = CharField(max_length=10)
+            password = CharField(widget=PasswordInput)
+
+        # Here, we're not submitting any data, so the initial value will be displayed.)
+        p = UserRegistration(initial={'username': 'django'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="django" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>""")
+        p = UserRegistration(initial={'username': 'stephane'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="stephane" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>""")
+
+        # The 'initial' parameter is meaningless if you pass data.
+        p = UserRegistration({}, initial={'username': 'django'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>This field is required.</li></ul>Username: <input type="text" name="username" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>""")
+        p = UserRegistration({'username': u''}, initial={'username': 'django'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>This field is required.</li></ul>Username: <input type="text" name="username" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>""")
+        p = UserRegistration({'username': u'foo'}, initial={'username': 'django'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="foo" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>""")
+
+        # A dynamic 'initial' value is *not* used as a fallback if data is not provided.
+        # In this example, we don't provide a value for 'username', and the form raises a
+        # validation error rather than using the initial value for 'username'.
+        p = UserRegistration({'password': 'secret'}, initial={'username': 'django'})
+        self.assertEqual(p.errors['username'], [u'This field is required.'])
+        self.assertFalse(p.is_valid())
+
+        # If a Form defines 'initial' *and* 'initial' is passed as a parameter to Form(),
+        # then the latter will get precedence.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, initial='django')
+            password = CharField(widget=PasswordInput)
+
+        p = UserRegistration(initial={'username': 'babik'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="babik" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>""")
+
+    def test_callable_initial_data(self):
+        # The previous technique dealt with raw values as initial data, but it's also
+        # possible to specify callable data.
+        class UserRegistration(Form):
+            username = CharField(max_length=10)
+            password = CharField(widget=PasswordInput)
+            options = MultipleChoiceField(choices=[('f','foo'),('b','bar'),('w','whiz')])
+
+        # We need to define functions that get called later.)
+        def initial_django():
+            return 'django'
+
+        def initial_stephane():
+            return 'stephane'
+
+        def initial_options():
+            return ['f','b']
+
+        def initial_other_options():
+            return ['b','w']
+
+        # Here, we're not submitting any data, so the initial value will be displayed.)
+        p = UserRegistration(initial={'username': initial_django, 'options': initial_options}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="django" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>
+<li>Options: <select multiple="multiple" name="options">
+<option value="f" selected="selected">foo</option>
+<option value="b" selected="selected">bar</option>
+<option value="w">whiz</option>
+</select></li>""")
+
+        # The 'initial' parameter is meaningless if you pass data.
+        p = UserRegistration({}, initial={'username': initial_django, 'options': initial_options}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>This field is required.</li></ul>Username: <input type="text" name="username" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Options: <select multiple="multiple" name="options">
+<option value="f">foo</option>
+<option value="b">bar</option>
+<option value="w">whiz</option>
+</select></li>""")
+        p = UserRegistration({'username': u''}, initial={'username': initial_django}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li><ul class="errorlist"><li>This field is required.</li></ul>Username: <input type="text" name="username" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Options: <select multiple="multiple" name="options">
+<option value="f">foo</option>
+<option value="b">bar</option>
+<option value="w">whiz</option>
+</select></li>""")
+        p = UserRegistration({'username': u'foo', 'options':['f','b']}, initial={'username': initial_django}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="foo" maxlength="10" /></li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /></li>
+<li>Options: <select multiple="multiple" name="options">
+<option value="f" selected="selected">foo</option>
+<option value="b" selected="selected">bar</option>
+<option value="w">whiz</option>
+</select></li>""")
+
+        # A callable 'initial' value is *not* used as a fallback if data is not provided.
+        # In this example, we don't provide a value for 'username', and the form raises a
+        # validation error rather than using the initial value for 'username'.
+        p = UserRegistration({'password': 'secret'}, initial={'username': initial_django, 'options': initial_options})
+        self.assertEqual(p.errors['username'], [u'This field is required.'])
+        self.assertFalse(p.is_valid())
+
+        # If a Form defines 'initial' *and* 'initial' is passed as a parameter to Form(),
+        # then the latter will get precedence.
+        class UserRegistration(Form):
+           username = CharField(max_length=10, initial=initial_django)
+           password = CharField(widget=PasswordInput)
+           options = MultipleChoiceField(choices=[('f','foo'),('b','bar'),('w','whiz')], initial=initial_other_options)
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="django" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>
+<li>Options: <select multiple="multiple" name="options">
+<option value="f">foo</option>
+<option value="b" selected="selected">bar</option>
+<option value="w" selected="selected">whiz</option>
+</select></li>""")
+        p = UserRegistration(initial={'username': initial_stephane, 'options': initial_options}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="stephane" maxlength="10" /></li>
+<li>Password: <input type="password" name="password" /></li>
+<li>Options: <select multiple="multiple" name="options">
+<option value="f" selected="selected">foo</option>
+<option value="b" selected="selected">bar</option>
+<option value="w">whiz</option>
+</select></li>""")
+
+    def test_help_text(self):
+        # You can specify descriptive text for a field by using the 'help_text' argument)
+        class UserRegistration(Form):
+            username = CharField(max_length=10, help_text='e.g., user@example.com')
+            password = CharField(widget=PasswordInput, help_text='Choose wisely.')
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /> e.g., user@example.com</li>
+<li>Password: <input type="password" name="password" /> Choose wisely.</li>""")
+        self.assertEqual(p.as_p(), """<p>Username: <input type="text" name="username" maxlength="10" /> e.g., user@example.com</p>
+<p>Password: <input type="password" name="password" /> Choose wisely.</p>""")
+        self.assertEqual(p.as_table(), """<tr><th>Username:</th><td><input type="text" name="username" maxlength="10" /><br />e.g., user@example.com</td></tr>
+<tr><th>Password:</th><td><input type="password" name="password" /><br />Choose wisely.</td></tr>""")
+
+        # The help text is displayed whether or not data is provided for the form.
+        p = UserRegistration({'username': u'foo'}, auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" value="foo" maxlength="10" /> e.g., user@example.com</li>
+<li><ul class="errorlist"><li>This field is required.</li></ul>Password: <input type="password" name="password" /> Choose wisely.</li>""")
+
+        # help_text is not displayed for hidden fields. It can be used for documentation
+        # purposes, though.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, help_text='e.g., user@example.com')
+            password = CharField(widget=PasswordInput)
+            next = CharField(widget=HiddenInput, initial='/', help_text='Redirect destination')
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /> e.g., user@example.com</li>
+<li>Password: <input type="password" name="password" /><input type="hidden" name="next" value="/" /></li>""")
+
+        # Help text can include arbitrary Unicode characters.
+        class UserRegistration(Form):
+            username = CharField(max_length=10, help_text='ŠĐĆŽćžšđ')
+
+        p = UserRegistration(auto_id=False)
+        self.assertEqual(p.as_ul(), u'<li>Username: <input type="text" name="username" maxlength="10" /> \u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111</li>')
+
+    def test_subclassing_forms(self):
+        # You can subclass a Form to add fields. The resulting form subclass will have
+        # all of the fields of the parent Form, plus whichever fields you define in the
+        # subclass.
+        class Person(Form):
+            first_name = CharField()
+            last_name = CharField()
+            birthday = DateField()
+
+        class Musician(Person):
+            instrument = CharField()
+
+        p = Person(auto_id=False)
+        self.assertEqual(p.as_ul(), """<li>First name: <input type="text" name="first_name" /></li>
+<li>Last name: <input type="text" name="last_name" /></li>
+<li>Birthday: <input type="text" name="birthday" /></li>""")
+        m = Musician(auto_id=False)
+        self.assertEqual(m.as_ul(), """<li>First name: <input type="text" name="first_name" /></li>
+<li>Last name: <input type="text" name="last_name" /></li>
+<li>Birthday: <input type="text" name="birthday" /></li>
+<li>Instrument: <input type="text" name="instrument" /></li>""")
+
+        # Yes, you can subclass multiple forms. The fields are added in the order in
+        # which the parent classes are listed.
+        class Person(Form):
+            first_name = CharField()
+            last_name = CharField()
+            birthday = DateField()
+
+        class Instrument(Form):
+            instrument = CharField()
+
+        class Beatle(Person, Instrument):
+            haircut_type = CharField()
+
+        b = Beatle(auto_id=False)
+        self.assertEqual(b.as_ul(), """<li>First name: <input type="text" name="first_name" /></li>
+<li>Last name: <input type="text" name="last_name" /></li>
+<li>Birthday: <input type="text" name="birthday" /></li>
+<li>Instrument: <input type="text" name="instrument" /></li>
+<li>Haircut type: <input type="text" name="haircut_type" /></li>""")
+
+    def test_forms_with_prefixes(self):
+        # Sometimes it's necessary to have multiple forms display on the same HTML page,
+        # or multiple copies of the same form. We can accomplish this with form prefixes.
+        # Pass the keyword argument 'prefix' to the Form constructor to use this feature.
+        # This value will be prepended to each HTML form field name. One way to think
+        # about this is "namespaces for HTML forms". Notice that in the data argument,
+        # each field's key has the prefix, in this case 'person1', prepended to the
+        # actual field name.
+        class Person(Form):
+            first_name = CharField()
+            last_name = CharField()
+            birthday = DateField()
+
+        data = {
+            'person1-first_name': u'John',
+            'person1-last_name': u'Lennon',
+            'person1-birthday': u'1940-10-9'
+        }
+        p = Person(data, prefix='person1')
+        self.assertEqual(p.as_ul(), """<li><label for="id_person1-first_name">First name:</label> <input type="text" name="person1-first_name" value="John" id="id_person1-first_name" /></li>
+<li><label for="id_person1-last_name">Last name:</label> <input type="text" name="person1-last_name" value="Lennon" id="id_person1-last_name" /></li>
+<li><label for="id_person1-birthday">Birthday:</label> <input type="text" name="person1-birthday" value="1940-10-9" id="id_person1-birthday" /></li>""")
+        self.assertEqual(str(p['first_name']), '<input type="text" name="person1-first_name" value="John" id="id_person1-first_name" />')
+        self.assertEqual(str(p['last_name']), '<input type="text" name="person1-last_name" value="Lennon" id="id_person1-last_name" />')
+        self.assertEqual(str(p['birthday']), '<input type="text" name="person1-birthday" value="1940-10-9" id="id_person1-birthday" />')
+        self.assertEqual(p.errors, {})
+        self.assertTrue(p.is_valid())
+        self.assertEqual(p.cleaned_data['first_name'], u'John')
+        self.assertEqual(p.cleaned_data['last_name'], u'Lennon')
+        self.assertEqual(p.cleaned_data['birthday'], datetime.date(1940, 10, 9))
+
+        # Let's try submitting some bad data to make sure form.errors and field.errors
+        # work as expected.
+        data = {
+            'person1-first_name': u'',
+            'person1-last_name': u'',
+            'person1-birthday': u''
+        }
+        p = Person(data, prefix='person1')
+        self.assertEqual(p.errors['first_name'], [u'This field is required.'])
+        self.assertEqual(p.errors['last_name'], [u'This field is required.'])
+        self.assertEqual(p.errors['birthday'], [u'This field is required.'])
+        self.assertEqual(p['first_name'].errors, [u'This field is required.'])
+        try:
+            p['person1-first_name'].errors
+            self.fail('Attempts to access non-existent fields should fail.')
+        except KeyError:
+            pass
+
+        # In this example, the data doesn't have a prefix, but the form requires it, so
+        # the form doesn't "see" the fields.
+        data = {
+            'first_name': u'John',
+            'last_name': u'Lennon',
+            'birthday': u'1940-10-9'
+        }
+        p = Person(data, prefix='person1')
+        self.assertEqual(p.errors['first_name'], [u'This field is required.'])
+        self.assertEqual(p.errors['last_name'], [u'This field is required.'])
+        self.assertEqual(p.errors['birthday'], [u'This field is required.'])
+
+        # With prefixes, a single data dictionary can hold data for multiple instances
+        # of the same form.
+        data = {
+            'person1-first_name': u'John',
+            'person1-last_name': u'Lennon',
+            'person1-birthday': u'1940-10-9',
+            'person2-first_name': u'Jim',
+            'person2-last_name': u'Morrison',
+            'person2-birthday': u'1943-12-8'
+        }
+        p1 = Person(data, prefix='person1')
+        self.assertTrue(p1.is_valid())
+        self.assertEqual(p1.cleaned_data['first_name'], u'John')
+        self.assertEqual(p1.cleaned_data['last_name'], u'Lennon')
+        self.assertEqual(p1.cleaned_data['birthday'], datetime.date(1940, 10, 9))
+        p2 = Person(data, prefix='person2')
+        self.assertTrue(p2.is_valid())
+        self.assertEqual(p2.cleaned_data['first_name'], u'Jim')
+        self.assertEqual(p2.cleaned_data['last_name'], u'Morrison')
+        self.assertEqual(p2.cleaned_data['birthday'], datetime.date(1943, 12, 8))
+
+        # By default, forms append a hyphen between the prefix and the field name, but a
+        # form can alter that behavior by implementing the add_prefix() method. This
+        # method takes a field name and returns the prefixed field, according to
+        # self.prefix.
+        class Person(Form):
+            first_name = CharField()
+            last_name = CharField()
+            birthday = DateField()
+
+            def add_prefix(self, field_name):
+                return self.prefix and '%s-prefix-%s' % (self.prefix, field_name) or field_name
+
+        p = Person(prefix='foo')
+        self.assertEqual(p.as_ul(), """<li><label for="id_foo-prefix-first_name">First name:</label> <input type="text" name="foo-prefix-first_name" id="id_foo-prefix-first_name" /></li>
+<li><label for="id_foo-prefix-last_name">Last name:</label> <input type="text" name="foo-prefix-last_name" id="id_foo-prefix-last_name" /></li>
+<li><label for="id_foo-prefix-birthday">Birthday:</label> <input type="text" name="foo-prefix-birthday" id="id_foo-prefix-birthday" /></li>""")
+        data = {
+            'foo-prefix-first_name': u'John',
+            'foo-prefix-last_name': u'Lennon',
+            'foo-prefix-birthday': u'1940-10-9'
+        }
+        p = Person(data, prefix='foo')
+        self.assertTrue(p.is_valid())
+        self.assertEqual(p.cleaned_data['first_name'], u'John')
+        self.assertEqual(p.cleaned_data['last_name'], u'Lennon')
+        self.assertEqual(p.cleaned_data['birthday'], datetime.date(1940, 10, 9))
+
+    def test_forms_with_null_boolean(self):
+        # NullBooleanField is a bit of a special case because its presentation (widget)
+        # is different than its data. This is handled transparently, though.
+        class Person(Form):
+            name = CharField()
+            is_cool = NullBooleanField()
+
+        p = Person({'name': u'Joe'}, auto_id=False)
+        self.assertEqual(str(p['is_cool']), """<select name="is_cool">
+<option value="1" selected="selected">Unknown</option>
+<option value="2">Yes</option>
+<option value="3">No</option>
+</select>""")
+        p = Person({'name': u'Joe', 'is_cool': u'1'}, auto_id=False)
+        self.assertEqual(str(p['is_cool']), """<select name="is_cool">
+<option value="1" selected="selected">Unknown</option>
+<option value="2">Yes</option>
+<option value="3">No</option>
+</select>""")
+        p = Person({'name': u'Joe', 'is_cool': u'2'}, auto_id=False)
+        self.assertEqual(str(p['is_cool']), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2" selected="selected">Yes</option>
+<option value="3">No</option>
+</select>""")
+        p = Person({'name': u'Joe', 'is_cool': u'3'}, auto_id=False)
+        self.assertEqual(str(p['is_cool']), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2">Yes</option>
+<option value="3" selected="selected">No</option>
+</select>""")
+        p = Person({'name': u'Joe', 'is_cool': True}, auto_id=False)
+        self.assertEqual(str(p['is_cool']), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2" selected="selected">Yes</option>
+<option value="3">No</option>
+</select>""")
+        p = Person({'name': u'Joe', 'is_cool': False}, auto_id=False)
+        self.assertEqual(str(p['is_cool']), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2">Yes</option>
+<option value="3" selected="selected">No</option>
+</select>""")
+
+    def test_forms_with_file_fields(self):
+        # FileFields are a special case because they take their data from the request.FILES,
+        # not request.POST.
+        class FileForm(Form):
+            file1 = FileField()
+
+        f = FileForm(auto_id=False)
+        self.assertEqual(f.as_table(), '<tr><th>File1:</th><td><input type="file" name="file1" /></td></tr>')
+
+        f = FileForm(data={}, files={}, auto_id=False)
+        self.assertEqual(f.as_table(), '<tr><th>File1:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="file" name="file1" /></td></tr>')
+
+        f = FileForm(data={}, files={'file1': SimpleUploadedFile('name', '')}, auto_id=False)
+        self.assertEqual(f.as_table(), '<tr><th>File1:</th><td><ul class="errorlist"><li>The submitted file is empty.</li></ul><input type="file" name="file1" /></td></tr>')
+
+        f = FileForm(data={}, files={'file1': 'something that is not a file'}, auto_id=False)
+        self.assertEqual(f.as_table(), '<tr><th>File1:</th><td><ul class="errorlist"><li>No file was submitted. Check the encoding type on the form.</li></ul><input type="file" name="file1" /></td></tr>')
+
+        f = FileForm(data={}, files={'file1': SimpleUploadedFile('name', 'some content')}, auto_id=False)
+        self.assertEqual(f.as_table(), '<tr><th>File1:</th><td><input type="file" name="file1" /></td></tr>')
+        self.assertTrue(f.is_valid())
+
+        f = FileForm(data={}, files={'file1': SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह')}, auto_id=False)
+        self.assertEqual(f.as_table(), '<tr><th>File1:</th><td><input type="file" name="file1" /></td></tr>')
+
+    def test_basic_processing_in_view(self):
+        class UserRegistration(Form):
+            username = CharField(max_length=10)
+            password1 = CharField(widget=PasswordInput)
+            password2 = CharField(widget=PasswordInput)
+
+            def clean(self):
+                if self.cleaned_data.get('password1') and self.cleaned_data.get('password2') and self.cleaned_data['password1'] != self.cleaned_data['password2']:
+                    raise ValidationError(u'Please make sure your passwords match.')
+
+                return self.cleaned_data
+
+        def my_function(method, post_data):
+            if method == 'POST':
+                form = UserRegistration(post_data, auto_id=False)
+            else:
+                form = UserRegistration(auto_id=False)
+
+            if form.is_valid():
+                return 'VALID: %r' % form.cleaned_data
+
+            t = Template('<form action="" method="post">\n<table>\n{{ form }}\n</table>\n<input type="submit" />\n</form>')
+            return t.render(Context({'form': form}))
+
+        # Case 1: GET (an empty form, with no errors).)
+        self.assertEqual(my_function('GET', {}), """<form action="" method="post">
+<table>
+<tr><th>Username:</th><td><input type="text" name="username" maxlength="10" /></td></tr>
+<tr><th>Password1:</th><td><input type="password" name="password1" /></td></tr>
+<tr><th>Password2:</th><td><input type="password" name="password2" /></td></tr>
+</table>
+<input type="submit" />
+</form>""")
+        # Case 2: POST with erroneous data (a redisplayed form, with errors).)
+        self.assertEqual(my_function('POST', {'username': 'this-is-a-long-username', 'password1': 'foo', 'password2': 'bar'}), """<form action="" method="post">
+<table>
+<tr><td colspan="2"><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></td></tr>
+<tr><th>Username:</th><td><ul class="errorlist"><li>Ensure this value has at most 10 characters (it has 23).</li></ul><input type="text" name="username" value="this-is-a-long-username" maxlength="10" /></td></tr>
+<tr><th>Password1:</th><td><input type="password" name="password1" value="foo" /></td></tr>
+<tr><th>Password2:</th><td><input type="password" name="password2" value="bar" /></td></tr>
+</table>
+<input type="submit" />
+</form>""")
+        # Case 3: POST with valid data (the success message).)
+        self.assertEqual(my_function('POST', {'username': 'adrian', 'password1': 'secret', 'password2': 'secret'}), "VALID: {'username': u'adrian', 'password1': u'secret', 'password2': u'secret'}")
+
+    def test_templates_with_forms(self):
+        class UserRegistration(Form):
+            username = CharField(max_length=10, help_text="Good luck picking a username that doesn't already exist.")
+            password1 = CharField(widget=PasswordInput)
+            password2 = CharField(widget=PasswordInput)
+
+            def clean(self):
+                if self.cleaned_data.get('password1') and self.cleaned_data.get('password2') and self.cleaned_data['password1'] != self.cleaned_data['password2']:
+                    raise ValidationError(u'Please make sure your passwords match.')
+
+                return self.cleaned_data
+
+        # You have full flexibility in displaying form fields in a template. Just pass a
+        # Form instance to the template, and use "dot" access to refer to individual
+        # fields. Note, however, that this flexibility comes with the responsibility of
+        # displaying all the errors, including any that might not be associated with a
+        # particular field.
+        t = Template('''<form action="">
+{{ form.username.errors.as_ul }}<p><label>Your username: {{ form.username }}</label></p>
+{{ form.password1.errors.as_ul }}<p><label>Password: {{ form.password1 }}</label></p>
+{{ form.password2.errors.as_ul }}<p><label>Password (again): {{ form.password2 }}</label></p>
+<input type="submit" />
+</form>''')
+        self.assertEqual(t.render(Context({'form': UserRegistration(auto_id=False)})), """<form action="">
+<p><label>Your username: <input type="text" name="username" maxlength="10" /></label></p>
+<p><label>Password: <input type="password" name="password1" /></label></p>
+<p><label>Password (again): <input type="password" name="password2" /></label></p>
+<input type="submit" />
+</form>""")
+        self.assertEqual(t.render(Context({'form': UserRegistration({'username': 'django'}, auto_id=False)})), """<form action="">
+<p><label>Your username: <input type="text" name="username" value="django" maxlength="10" /></label></p>
+<ul class="errorlist"><li>This field is required.</li></ul><p><label>Password: <input type="password" name="password1" /></label></p>
+<ul class="errorlist"><li>This field is required.</li></ul><p><label>Password (again): <input type="password" name="password2" /></label></p>
+<input type="submit" />
+</form>""")
+
+        # Use form.[field].label to output a field's label. You can specify the label for
+        # a field by using the 'label' argument to a Field class. If you don't specify
+        # 'label', Django will use the field name with underscores converted to spaces,
+        # and the initial letter capitalized.
+        t = Template('''<form action="">
+<p><label>{{ form.username.label }}: {{ form.username }}</label></p>
+<p><label>{{ form.password1.label }}: {{ form.password1 }}</label></p>
+<p><label>{{ form.password2.label }}: {{ form.password2 }}</label></p>
+<input type="submit" />
+</form>''')
+        self.assertEqual(t.render(Context({'form': UserRegistration(auto_id=False)})), """<form action="">
+<p><label>Username: <input type="text" name="username" maxlength="10" /></label></p>
+<p><label>Password1: <input type="password" name="password1" /></label></p>
+<p><label>Password2: <input type="password" name="password2" /></label></p>
+<input type="submit" />
+</form>""")
+
+        # User form.[field].label_tag to output a field's label with a <label> tag
+        # wrapped around it, but *only* if the given field has an "id" attribute.
+        # Recall from above that passing the "auto_id" argument to a Form gives each
+        # field an "id" attribute.
+        t = Template('''<form action="">
+<p>{{ form.username.label_tag }}: {{ form.username }}</p>
+<p>{{ form.password1.label_tag }}: {{ form.password1 }}</p>
+<p>{{ form.password2.label_tag }}: {{ form.password2 }}</p>
+<input type="submit" />
+</form>''')
+        self.assertEqual(t.render(Context({'form': UserRegistration(auto_id=False)})), """<form action="">
+<p>Username: <input type="text" name="username" maxlength="10" /></p>
+<p>Password1: <input type="password" name="password1" /></p>
+<p>Password2: <input type="password" name="password2" /></p>
+<input type="submit" />
+</form>""")
+        self.assertEqual(t.render(Context({'form': UserRegistration(auto_id='id_%s')})), """<form action="">
+<p><label for="id_username">Username</label>: <input id="id_username" type="text" name="username" maxlength="10" /></p>
+<p><label for="id_password1">Password1</label>: <input type="password" name="password1" id="id_password1" /></p>
+<p><label for="id_password2">Password2</label>: <input type="password" name="password2" id="id_password2" /></p>
+<input type="submit" />
+</form>""")
+
+        # User form.[field].help_text to output a field's help text. If the given field
+        # does not have help text, nothing will be output.
+        t = Template('''<form action="">
+<p>{{ form.username.label_tag }}: {{ form.username }}<br />{{ form.username.help_text }}</p>
+<p>{{ form.password1.label_tag }}: {{ form.password1 }}</p>
+<p>{{ form.password2.label_tag }}: {{ form.password2 }}</p>
+<input type="submit" />
+</form>''')
+        self.assertEqual(t.render(Context({'form': UserRegistration(auto_id=False)})), """<form action="">
+<p>Username: <input type="text" name="username" maxlength="10" /><br />Good luck picking a username that doesn&#39;t already exist.</p>
+<p>Password1: <input type="password" name="password1" /></p>
+<p>Password2: <input type="password" name="password2" /></p>
+<input type="submit" />
+</form>""")
+        self.assertEqual(Template('{{ form.password1.help_text }}').render(Context({'form': UserRegistration(auto_id=False)})), u'')
+
+        # The label_tag() method takes an optional attrs argument: a dictionary of HTML
+        # attributes to add to the <label> tag.
+        f = UserRegistration(auto_id='id_%s')
+        form_output = []
+
+        for bf in f:
+            form_output.append(bf.label_tag(attrs={'class': 'pretty'}))
+
+        self.assertEqual(form_output, [
+            '<label for="id_username" class="pretty">Username</label>',
+            '<label for="id_password1" class="pretty">Password1</label>',
+            '<label for="id_password2" class="pretty">Password2</label>',
+        ])
+
+        # To display the errors that aren't associated with a particular field -- e.g.,
+        # the errors caused by Form.clean() -- use {{ form.non_field_errors }} in the
+        # template. If used on its own, it is displayed as a <ul> (or an empty string, if
+        # the list of errors is empty). You can also use it in {% if %} statements.
+        t = Template('''<form action="">
+{{ form.username.errors.as_ul }}<p><label>Your username: {{ form.username }}</label></p>
+{{ form.password1.errors.as_ul }}<p><label>Password: {{ form.password1 }}</label></p>
+{{ form.password2.errors.as_ul }}<p><label>Password (again): {{ form.password2 }}</label></p>
+<input type="submit" />
+</form>''')
+        self.assertEqual(t.render(Context({'form': UserRegistration({'username': 'django', 'password1': 'foo', 'password2': 'bar'}, auto_id=False)})), """<form action="">
+<p><label>Your username: <input type="text" name="username" value="django" maxlength="10" /></label></p>
+<p><label>Password: <input type="password" name="password1" value="foo" /></label></p>
+<p><label>Password (again): <input type="password" name="password2" value="bar" /></label></p>
+<input type="submit" />
+</form>""")
+        t = Template('''<form action="">
+{{ form.non_field_errors }}
+{{ form.username.errors.as_ul }}<p><label>Your username: {{ form.username }}</label></p>
+{{ form.password1.errors.as_ul }}<p><label>Password: {{ form.password1 }}</label></p>
+{{ form.password2.errors.as_ul }}<p><label>Password (again): {{ form.password2 }}</label></p>
+<input type="submit" />
+</form>''')
+        self.assertEqual(t.render(Context({'form': UserRegistration({'username': 'django', 'password1': 'foo', 'password2': 'bar'}, auto_id=False)})), """<form action="">
+<ul class="errorlist"><li>Please make sure your passwords match.</li></ul>
+<p><label>Your username: <input type="text" name="username" value="django" maxlength="10" /></label></p>
+<p><label>Password: <input type="password" name="password1" value="foo" /></label></p>
+<p><label>Password (again): <input type="password" name="password2" value="bar" /></label></p>
+<input type="submit" />
+</form>""")
+
+    def test_empty_permitted(self):
+        # Sometimes (pretty much in formsets) we want to allow a form to pass validation
+        # if it is completely empty. We can accomplish this by using the empty_permitted
+        # agrument to a form constructor.
+        class SongForm(Form):
+            artist = CharField()
+            name = CharField()
+
+        # First let's show what happens id empty_permitted=False (the default):
+        data = {'artist': '', 'song': ''}
+        form = SongForm(data, empty_permitted=False)
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors, {'name': [u'This field is required.'], 'artist': [u'This field is required.']})
+        try:
+            form.cleaned_data
+            self.fail('Attempts to access cleaned_data when validation fails should fail.')
+        except AttributeError:
+            pass
+
+        # Now let's show what happens when empty_permitted=True and the form is empty.
+        form = SongForm(data, empty_permitted=True)
+        self.assertTrue(form.is_valid())
+        self.assertEqual(form.errors, {})
+        self.assertEqual(form.cleaned_data, {})
+
+        # But if we fill in data for one of the fields, the form is no longer empty and
+        # the whole thing must pass validation.
+        data = {'artist': 'The Doors', 'song': ''}
+        form = SongForm(data, empty_permitted=False)
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors, {'name': [u'This field is required.']})
+        try:
+            form.cleaned_data
+            self.fail('Attempts to access cleaned_data when validation fails should fail.')
+        except AttributeError:
+            pass
+
+        # If a field is not given in the data then None is returned for its data. Lets
+        # make sure that when checking for empty_permitted that None is treated
+        # accordingly.
+        data = {'artist': None, 'song': ''}
+        form = SongForm(data, empty_permitted=True)
+        self.assertTrue(form.is_valid())
+
+        # However, we *really* need to be sure we are checking for None as any data in
+        # initial that returns False on a boolean call needs to be treated literally.
+        class PriceForm(Form):
+            amount = FloatField()
+            qty = IntegerField()
+
+        data = {'amount': '0.0', 'qty': ''}
+        form = PriceForm(data, initial={'amount': 0.0}, empty_permitted=True)
+        self.assertTrue(form.is_valid())
+
+    def test_extracting_hidden_and_visible(self):
+        class SongForm(Form):
+            token = CharField(widget=HiddenInput)
+            artist = CharField()
+            name = CharField()
+
+        form = SongForm()
+        self.assertEqual([f.name for f in form.hidden_fields()], ['token'])
+        self.assertEqual([f.name for f in form.visible_fields()], ['artist', 'name'])
+
+    def test_hidden_initial_gets_id(self):
+        class MyForm(Form):
+            field1 = CharField(max_length=50, show_hidden_initial=True)
+
+        self.assertEqual(MyForm().as_table(), '<tr><th><label for="id_field1">Field1:</label></th><td><input id="id_field1" type="text" name="field1" maxlength="50" /><input type="hidden" name="initial-field1" id="initial-id_field1" /></td></tr>')
+
+    def test_error_html_required_html_classes(self):
+        class Person(Form):
+            name = CharField()
+            is_cool = NullBooleanField()
+            email = EmailField(required=False)
+            age = IntegerField()
+
+        p = Person({})
+        p.error_css_class = 'error'
+        p.required_css_class = 'required'
+
+        self.assertEqual(p.as_ul(), """<li class="required error"><ul class="errorlist"><li>This field is required.</li></ul><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></li>
+<li class="required"><label for="id_is_cool">Is cool:</label> <select name="is_cool" id="id_is_cool">
+<option value="1" selected="selected">Unknown</option>
+<option value="2">Yes</option>
+<option value="3">No</option>
+</select></li>
+<li><label for="id_email">Email:</label> <input type="text" name="email" id="id_email" /></li>
+<li class="required error"><ul class="errorlist"><li>This field is required.</li></ul><label for="id_age">Age:</label> <input type="text" name="age" id="id_age" /></li>""")
+
+        self.assertEqual(p.as_p(), """<ul class="errorlist"><li>This field is required.</li></ul>
+<p class="required error"><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></p>
+<p class="required"><label for="id_is_cool">Is cool:</label> <select name="is_cool" id="id_is_cool">
+<option value="1" selected="selected">Unknown</option>
+<option value="2">Yes</option>
+<option value="3">No</option>
+</select></p>
+<p><label for="id_email">Email:</label> <input type="text" name="email" id="id_email" /></p>
+<ul class="errorlist"><li>This field is required.</li></ul>
+<p class="required error"><label for="id_age">Age:</label> <input type="text" name="age" id="id_age" /></p>""")
+
+        self.assertEqual(p.as_table(), """<tr class="required error"><th><label for="id_name">Name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="name" id="id_name" /></td></tr>
+<tr class="required"><th><label for="id_is_cool">Is cool:</label></th><td><select name="is_cool" id="id_is_cool">
+<option value="1" selected="selected">Unknown</option>
+<option value="2">Yes</option>
+<option value="3">No</option>
+</select></td></tr>
+<tr><th><label for="id_email">Email:</label></th><td><input type="text" name="email" id="id_email" /></td></tr>
+<tr class="required error"><th><label for="id_age">Age:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="age" id="id_age" /></td></tr>""")
+
+    def test_label_split_datetime_not_displayed(self):
+        class EventForm(Form):
+            happened_at = SplitDateTimeField(widget=widgets.SplitHiddenDateTimeWidget)
+
+        form = EventForm()
+        self.assertEqual(form.as_ul(), u'<input type="hidden" name="happened_at_0" id="id_happened_at_0" /><input type="hidden" name="happened_at_1" id="id_happened_at_1" />')
diff --git a/parts/django/tests/regressiontests/forms/tests/formsets.py b/parts/django/tests/regressiontests/forms/tests/formsets.py
new file mode 100644
index 0000000..db94797
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/formsets.py
@@ -0,0 +1,763 @@
+# -*- coding: utf-8 -*-
+from unittest import TestCase
+from django.forms import Form, CharField, IntegerField, ValidationError
+from django.forms.formsets import formset_factory, BaseFormSet
+
+
+class Choice(Form):
+    choice = CharField()
+    votes = IntegerField()
+
+
+# FormSet allows us to use multiple instance of the same form on 1 page. For now,
+# the best way to create a FormSet is by using the formset_factory function.
+ChoiceFormSet = formset_factory(Choice)
+
+
+class FavoriteDrinkForm(Form):
+    name = CharField()
+
+
+class BaseFavoriteDrinksFormSet(BaseFormSet):
+    def clean(self):
+        seen_drinks = []
+
+        for drink in self.cleaned_data:
+            if drink['name'] in seen_drinks:
+                raise ValidationError('You may only specify a drink once.')
+
+            seen_drinks.append(drink['name'])
+
+
+# Let's define a FormSet that takes a list of favorite drinks, but raises an
+# error if there are any duplicates. Used in ``test_clean_hook``,
+# ``test_regression_6926`` & ``test_regression_12878``.
+FavoriteDrinksFormSet = formset_factory(FavoriteDrinkForm,
+    formset=BaseFavoriteDrinksFormSet, extra=3)
+
+
+class FormsFormsetTestCase(TestCase):
+    def test_basic_formset(self):
+        # A FormSet constructor takes the same arguments as Form. Let's create a FormSet
+        # for adding data. By default, it displays 1 blank form. It can display more,
+        # but we'll look at how to do so later.
+        formset = ChoiceFormSet(auto_id=False, prefix='choices')
+        self.assertEqual(str(formset), """<input type="hidden" name="choices-TOTAL_FORMS" value="1" /><input type="hidden" name="choices-INITIAL_FORMS" value="0" /><input type="hidden" name="choices-MAX_NUM_FORMS" />
+<tr><th>Choice:</th><td><input type="text" name="choices-0-choice" /></td></tr>
+<tr><th>Votes:</th><td><input type="text" name="choices-0-votes" /></td></tr>""")
+
+        # On thing to note is that there needs to be a special value in the data. This
+        # value tells the FormSet how many forms were displayed so it can tell how
+        # many forms it needs to clean and validate. You could use javascript to create
+        # new forms on the client side, but they won't get validated unless you increment
+        # the TOTAL_FORMS field appropriately.
+
+        data = {
+            'choices-TOTAL_FORMS': '1', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+        }
+        # We treat FormSet pretty much like we would treat a normal Form. FormSet has an
+        # is_valid method, and a cleaned_data or errors attribute depending on whether all
+        # the forms passed validation. However, unlike a Form instance, cleaned_data and
+        # errors will be a list of dicts rather than just a single dict.
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        self.assertEqual([form.cleaned_data for form in formset.forms], [{'votes': 100, 'choice': u'Calexico'}])
+
+        # If a FormSet was not passed any data, its is_valid method should return False.
+        formset = ChoiceFormSet()
+        self.assertFalse(formset.is_valid())
+
+    def test_formset_validation(self):
+        # FormSet instances can also have an error attribute if validation failed for
+        # any of the forms.
+
+        data = {
+            'choices-TOTAL_FORMS': '1', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '',
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertFalse(formset.is_valid())
+        self.assertEqual(formset.errors, [{'votes': [u'This field is required.']}])
+
+    def test_formset_initial_data(self):
+        # We can also prefill a FormSet with existing data by providing an ``initial``
+        # argument to the constructor. ``initial`` should be a list of dicts. By default,
+        # an extra blank form is included.
+
+        initial = [{'choice': u'Calexico', 'votes': 100}]
+        formset = ChoiceFormSet(initial=initial, auto_id=False, prefix='choices')
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(form.as_ul())
+
+        self.assertEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
+<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Choice: <input type="text" name="choices-1-choice" /></li>
+<li>Votes: <input type="text" name="choices-1-votes" /></li>""")
+
+        # Let's simulate what would happen if we submitted this form.
+
+        data = {
+            'choices-TOTAL_FORMS': '2', # the number of forms rendered
+            'choices-INITIAL_FORMS': '1', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-1-choice': '',
+            'choices-1-votes': '',
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        self.assertEqual([form.cleaned_data for form in formset.forms], [{'votes': 100, 'choice': u'Calexico'}, {}])
+
+    def test_second_form_partially_filled(self):
+        # But the second form was blank! Shouldn't we get some errors? No. If we display
+        # a form as blank, it's ok for it to be submitted as blank. If we fill out even
+        # one of the fields of a blank form though, it will be validated. We may want to
+        # required that at least x number of forms are completed, but we'll show how to
+        # handle that later.
+
+        data = {
+            'choices-TOTAL_FORMS': '2', # the number of forms rendered
+            'choices-INITIAL_FORMS': '1', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-1-choice': 'The Decemberists',
+            'choices-1-votes': '', # missing value
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertFalse(formset.is_valid())
+        self.assertEqual(formset.errors, [{}, {'votes': [u'This field is required.']}])
+
+    def test_delete_prefilled_data(self):
+        # If we delete data that was pre-filled, we should get an error. Simply removing
+        # data from form fields isn't the proper way to delete it. We'll see how to
+        # handle that case later.
+
+        data = {
+            'choices-TOTAL_FORMS': '2', # the number of forms rendered
+            'choices-INITIAL_FORMS': '1', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': '', # deleted value
+            'choices-0-votes': '', # deleted value
+            'choices-1-choice': '',
+            'choices-1-votes': '',
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertFalse(formset.is_valid())
+        self.assertEqual(formset.errors, [{'votes': [u'This field is required.'], 'choice': [u'This field is required.']}, {}])
+
+    def test_displaying_more_than_one_blank_form(self):
+        # Displaying more than 1 blank form ###########################################
+        # We can also display more than 1 empty form at a time. To do so, pass a
+        # extra argument to formset_factory.
+        ChoiceFormSet = formset_factory(Choice, extra=3)
+
+        formset = ChoiceFormSet(auto_id=False, prefix='choices')
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(form.as_ul())
+
+        self.assertEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" /></li>
+<li>Votes: <input type="text" name="choices-0-votes" /></li>
+<li>Choice: <input type="text" name="choices-1-choice" /></li>
+<li>Votes: <input type="text" name="choices-1-votes" /></li>
+<li>Choice: <input type="text" name="choices-2-choice" /></li>
+<li>Votes: <input type="text" name="choices-2-votes" /></li>""")
+
+        # Since we displayed every form as blank, we will also accept them back as blank.
+        # This may seem a little strange, but later we will show how to require a minimum
+        # number of forms to be completed.
+
+        data = {
+            'choices-TOTAL_FORMS': '3', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': '',
+            'choices-0-votes': '',
+            'choices-1-choice': '',
+            'choices-1-votes': '',
+            'choices-2-choice': '',
+            'choices-2-votes': '',
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        self.assertEqual([form.cleaned_data for form in formset.forms], [{}, {}, {}])
+
+    def test_single_form_completed(self):
+        # We can just fill out one of the forms.
+
+        data = {
+            'choices-TOTAL_FORMS': '3', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-1-choice': '',
+            'choices-1-votes': '',
+            'choices-2-choice': '',
+            'choices-2-votes': '',
+        }
+
+        ChoiceFormSet = formset_factory(Choice, extra=3)
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        self.assertEqual([form.cleaned_data for form in formset.forms], [{'votes': 100, 'choice': u'Calexico'}, {}, {}])
+
+    def test_second_form_partially_filled_2(self):
+        # And once again, if we try to partially complete a form, validation will fail.
+
+        data = {
+            'choices-TOTAL_FORMS': '3', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-1-choice': 'The Decemberists',
+            'choices-1-votes': '', # missing value
+            'choices-2-choice': '',
+            'choices-2-votes': '',
+        }
+
+        ChoiceFormSet = formset_factory(Choice, extra=3)
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertFalse(formset.is_valid())
+        self.assertEqual(formset.errors, [{}, {'votes': [u'This field is required.']}, {}])
+
+    def test_more_initial_data(self):
+        # The extra argument also works when the formset is pre-filled with initial
+        # data.
+
+        data = {
+            'choices-TOTAL_FORMS': '3', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-1-choice': '',
+            'choices-1-votes': '', # missing value
+            'choices-2-choice': '',
+            'choices-2-votes': '',
+        }
+
+        initial = [{'choice': u'Calexico', 'votes': 100}]
+        ChoiceFormSet = formset_factory(Choice, extra=3)
+        formset = ChoiceFormSet(initial=initial, auto_id=False, prefix='choices')
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(form.as_ul())
+
+        self.assertEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
+<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Choice: <input type="text" name="choices-1-choice" /></li>
+<li>Votes: <input type="text" name="choices-1-votes" /></li>
+<li>Choice: <input type="text" name="choices-2-choice" /></li>
+<li>Votes: <input type="text" name="choices-2-votes" /></li>
+<li>Choice: <input type="text" name="choices-3-choice" /></li>
+<li>Votes: <input type="text" name="choices-3-votes" /></li>""")
+
+        # Make sure retrieving an empty form works, and it shows up in the form list
+
+        self.assertTrue(formset.empty_form.empty_permitted)
+        self.assertEqual(formset.empty_form.as_ul(), """<li>Choice: <input type="text" name="choices-__prefix__-choice" /></li>
+<li>Votes: <input type="text" name="choices-__prefix__-votes" /></li>""")
+
+    def test_formset_with_deletion(self):
+        # FormSets with deletion ######################################################
+        # We can easily add deletion ability to a FormSet with an argument to
+        # formset_factory. This will add a boolean field to each form instance. When
+        # that boolean field is True, the form will be in formset.deleted_forms
+
+        ChoiceFormSet = formset_factory(Choice, can_delete=True)
+
+        initial = [{'choice': u'Calexico', 'votes': 100}, {'choice': u'Fergie', 'votes': 900}]
+        formset = ChoiceFormSet(initial=initial, auto_id=False, prefix='choices')
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(form.as_ul())
+
+        self.assertEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
+<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Delete: <input type="checkbox" name="choices-0-DELETE" /></li>
+<li>Choice: <input type="text" name="choices-1-choice" value="Fergie" /></li>
+<li>Votes: <input type="text" name="choices-1-votes" value="900" /></li>
+<li>Delete: <input type="checkbox" name="choices-1-DELETE" /></li>
+<li>Choice: <input type="text" name="choices-2-choice" /></li>
+<li>Votes: <input type="text" name="choices-2-votes" /></li>
+<li>Delete: <input type="checkbox" name="choices-2-DELETE" /></li>""")
+
+        # To delete something, we just need to set that form's special delete field to
+        # 'on'. Let's go ahead and delete Fergie.
+
+        data = {
+            'choices-TOTAL_FORMS': '3', # the number of forms rendered
+            'choices-INITIAL_FORMS': '2', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-0-DELETE': '',
+            'choices-1-choice': 'Fergie',
+            'choices-1-votes': '900',
+            'choices-1-DELETE': 'on',
+            'choices-2-choice': '',
+            'choices-2-votes': '',
+            'choices-2-DELETE': '',
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        self.assertEqual([form.cleaned_data for form in formset.forms], [{'votes': 100, 'DELETE': False, 'choice': u'Calexico'}, {'votes': 900, 'DELETE': True, 'choice': u'Fergie'}, {}])
+        self.assertEqual([form.cleaned_data for form in formset.deleted_forms], [{'votes': 900, 'DELETE': True, 'choice': u'Fergie'}])
+
+        # If we fill a form with something and then we check the can_delete checkbox for
+        # that form, that form's errors should not make the entire formset invalid since
+        # it's going to be deleted.
+
+        class CheckForm(Form):
+           field = IntegerField(min_value=100)
+
+        data = {
+            'check-TOTAL_FORMS': '3', # the number of forms rendered
+            'check-INITIAL_FORMS': '2', # the number of forms with initial data
+            'check-MAX_NUM_FORMS': '0', # max number of forms
+            'check-0-field': '200',
+            'check-0-DELETE': '',
+            'check-1-field': '50',
+            'check-1-DELETE': 'on',
+            'check-2-field': '',
+            'check-2-DELETE': '',
+        }
+        CheckFormSet = formset_factory(CheckForm, can_delete=True)
+        formset = CheckFormSet(data, prefix='check')
+        self.assertTrue(formset.is_valid())
+
+        # If we remove the deletion flag now we will have our validation back.
+        data['check-1-DELETE'] = ''
+        formset = CheckFormSet(data, prefix='check')
+        self.assertFalse(formset.is_valid())
+
+        # Should be able to get deleted_forms from a valid formset even if a
+        # deleted form would have been invalid.
+
+        class Person(Form):
+            name = CharField()
+
+        PeopleForm = formset_factory(
+            form=Person,
+            can_delete=True)
+
+        p = PeopleForm(
+            {'form-0-name': u'', 'form-0-DELETE': u'on', # no name!
+             'form-TOTAL_FORMS': 1, 'form-INITIAL_FORMS': 1,
+             'form-MAX_NUM_FORMS': 1})
+
+        self.assertTrue(p.is_valid())
+        self.assertEqual(len(p.deleted_forms), 1)
+
+    def test_formsets_with_ordering(self):
+        # FormSets with ordering ######################################################
+        # We can also add ordering ability to a FormSet with an argument to
+        # formset_factory. This will add a integer field to each form instance. When
+        # form validation succeeds, [form.cleaned_data for form in formset.forms] will have the data in the correct
+        # order specified by the ordering fields. If a number is duplicated in the set
+        # of ordering fields, for instance form 0 and form 3 are both marked as 1, then
+        # the form index used as a secondary ordering criteria. In order to put
+        # something at the front of the list, you'd need to set it's order to 0.
+
+        ChoiceFormSet = formset_factory(Choice, can_order=True)
+
+        initial = [{'choice': u'Calexico', 'votes': 100}, {'choice': u'Fergie', 'votes': 900}]
+        formset = ChoiceFormSet(initial=initial, auto_id=False, prefix='choices')
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(form.as_ul())
+
+        self.assertEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
+<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Order: <input type="text" name="choices-0-ORDER" value="1" /></li>
+<li>Choice: <input type="text" name="choices-1-choice" value="Fergie" /></li>
+<li>Votes: <input type="text" name="choices-1-votes" value="900" /></li>
+<li>Order: <input type="text" name="choices-1-ORDER" value="2" /></li>
+<li>Choice: <input type="text" name="choices-2-choice" /></li>
+<li>Votes: <input type="text" name="choices-2-votes" /></li>
+<li>Order: <input type="text" name="choices-2-ORDER" /></li>""")
+
+        data = {
+            'choices-TOTAL_FORMS': '3', # the number of forms rendered
+            'choices-INITIAL_FORMS': '2', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-0-ORDER': '1',
+            'choices-1-choice': 'Fergie',
+            'choices-1-votes': '900',
+            'choices-1-ORDER': '2',
+            'choices-2-choice': 'The Decemberists',
+            'choices-2-votes': '500',
+            'choices-2-ORDER': '0',
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        form_output = []
+
+        for form in formset.ordered_forms:
+            form_output.append(form.cleaned_data)
+
+        self.assertEqual(form_output, [
+            {'votes': 500, 'ORDER': 0, 'choice': u'The Decemberists'},
+            {'votes': 100, 'ORDER': 1, 'choice': u'Calexico'},
+            {'votes': 900, 'ORDER': 2, 'choice': u'Fergie'},
+        ])
+
+    def test_empty_ordered_fields(self):
+        # Ordering fields are allowed to be left blank, and if they *are* left blank,
+        # they will be sorted below everything else.
+
+        data = {
+            'choices-TOTAL_FORMS': '4', # the number of forms rendered
+            'choices-INITIAL_FORMS': '3', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-0-ORDER': '1',
+            'choices-1-choice': 'Fergie',
+            'choices-1-votes': '900',
+            'choices-1-ORDER': '2',
+            'choices-2-choice': 'The Decemberists',
+            'choices-2-votes': '500',
+            'choices-2-ORDER': '',
+            'choices-3-choice': 'Basia Bulat',
+            'choices-3-votes': '50',
+            'choices-3-ORDER': '',
+        }
+
+        ChoiceFormSet = formset_factory(Choice, can_order=True)
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        form_output = []
+
+        for form in formset.ordered_forms:
+            form_output.append(form.cleaned_data)
+
+        self.assertEqual(form_output, [
+            {'votes': 100, 'ORDER': 1, 'choice': u'Calexico'},
+            {'votes': 900, 'ORDER': 2, 'choice': u'Fergie'},
+            {'votes': 500, 'ORDER': None, 'choice': u'The Decemberists'},
+            {'votes': 50, 'ORDER': None, 'choice': u'Basia Bulat'},
+        ])
+
+    def test_ordering_blank_fieldsets(self):
+        # Ordering should work with blank fieldsets.
+
+        data = {
+            'choices-TOTAL_FORMS': '3', # the number of forms rendered
+            'choices-INITIAL_FORMS': '0', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+        }
+
+        ChoiceFormSet = formset_factory(Choice, can_order=True)
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        form_output = []
+
+        for form in formset.ordered_forms:
+            form_output.append(form.cleaned_data)
+
+        self.assertEqual(form_output, [])
+
+    def test_formset_with_ordering_and_deletion(self):
+        # FormSets with ordering + deletion ###########################################
+        # Let's try throwing ordering and deletion into the same form.
+
+        ChoiceFormSet = formset_factory(Choice, can_order=True, can_delete=True)
+
+        initial = [
+            {'choice': u'Calexico', 'votes': 100},
+            {'choice': u'Fergie', 'votes': 900},
+            {'choice': u'The Decemberists', 'votes': 500},
+        ]
+        formset = ChoiceFormSet(initial=initial, auto_id=False, prefix='choices')
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(form.as_ul())
+
+        self.assertEqual('\n'.join(form_output), """<li>Choice: <input type="text" name="choices-0-choice" value="Calexico" /></li>
+<li>Votes: <input type="text" name="choices-0-votes" value="100" /></li>
+<li>Order: <input type="text" name="choices-0-ORDER" value="1" /></li>
+<li>Delete: <input type="checkbox" name="choices-0-DELETE" /></li>
+<li>Choice: <input type="text" name="choices-1-choice" value="Fergie" /></li>
+<li>Votes: <input type="text" name="choices-1-votes" value="900" /></li>
+<li>Order: <input type="text" name="choices-1-ORDER" value="2" /></li>
+<li>Delete: <input type="checkbox" name="choices-1-DELETE" /></li>
+<li>Choice: <input type="text" name="choices-2-choice" value="The Decemberists" /></li>
+<li>Votes: <input type="text" name="choices-2-votes" value="500" /></li>
+<li>Order: <input type="text" name="choices-2-ORDER" value="3" /></li>
+<li>Delete: <input type="checkbox" name="choices-2-DELETE" /></li>
+<li>Choice: <input type="text" name="choices-3-choice" /></li>
+<li>Votes: <input type="text" name="choices-3-votes" /></li>
+<li>Order: <input type="text" name="choices-3-ORDER" /></li>
+<li>Delete: <input type="checkbox" name="choices-3-DELETE" /></li>""")
+
+        # Let's delete Fergie, and put The Decemberists ahead of Calexico.
+
+        data = {
+            'choices-TOTAL_FORMS': '4', # the number of forms rendered
+            'choices-INITIAL_FORMS': '3', # the number of forms with initial data
+            'choices-MAX_NUM_FORMS': '0', # max number of forms
+            'choices-0-choice': 'Calexico',
+            'choices-0-votes': '100',
+            'choices-0-ORDER': '1',
+            'choices-0-DELETE': '',
+            'choices-1-choice': 'Fergie',
+            'choices-1-votes': '900',
+            'choices-1-ORDER': '2',
+            'choices-1-DELETE': 'on',
+            'choices-2-choice': 'The Decemberists',
+            'choices-2-votes': '500',
+            'choices-2-ORDER': '0',
+            'choices-2-DELETE': '',
+            'choices-3-choice': '',
+            'choices-3-votes': '',
+            'choices-3-ORDER': '',
+            'choices-3-DELETE': '',
+        }
+
+        formset = ChoiceFormSet(data, auto_id=False, prefix='choices')
+        self.assertTrue(formset.is_valid())
+        form_output = []
+
+        for form in formset.ordered_forms:
+            form_output.append(form.cleaned_data)
+
+        self.assertEqual(form_output, [
+            {'votes': 500, 'DELETE': False, 'ORDER': 0, 'choice': u'The Decemberists'},
+            {'votes': 100, 'DELETE': False, 'ORDER': 1, 'choice': u'Calexico'},
+        ])
+        self.assertEqual([form.cleaned_data for form in formset.deleted_forms], [{'votes': 900, 'DELETE': True, 'ORDER': 2, 'choice': u'Fergie'}])
+
+    def test_invalid_deleted_form_with_ordering(self):
+        # Should be able to get ordered forms from a valid formset even if a
+        # deleted form would have been invalid.
+
+        class Person(Form):
+            name = CharField()
+
+        PeopleForm = formset_factory(form=Person, can_delete=True, can_order=True)
+
+        p = PeopleForm({
+            'form-0-name': u'',
+            'form-0-DELETE': u'on', # no name!
+            'form-TOTAL_FORMS': 1,
+            'form-INITIAL_FORMS': 1,
+            'form-MAX_NUM_FORMS': 1
+        })
+
+        self.assertTrue(p.is_valid())
+        self.assertEqual(p.ordered_forms, [])
+
+    def test_clean_hook(self):
+        # FormSet clean hook ##########################################################
+        # FormSets have a hook for doing extra validation that shouldn't be tied to any
+        # particular form. It follows the same pattern as the clean hook on Forms.
+
+        # We start out with a some duplicate data.
+
+        data = {
+            'drinks-TOTAL_FORMS': '2', # the number of forms rendered
+            'drinks-INITIAL_FORMS': '0', # the number of forms with initial data
+            'drinks-MAX_NUM_FORMS': '0', # max number of forms
+            'drinks-0-name': 'Gin and Tonic',
+            'drinks-1-name': 'Gin and Tonic',
+        }
+
+        formset = FavoriteDrinksFormSet(data, prefix='drinks')
+        self.assertFalse(formset.is_valid())
+
+        # Any errors raised by formset.clean() are available via the
+        # formset.non_form_errors() method.
+
+        for error in formset.non_form_errors():
+            self.assertEqual(str(error), 'You may only specify a drink once.')
+
+        # Make sure we didn't break the valid case.
+
+        data = {
+            'drinks-TOTAL_FORMS': '2', # the number of forms rendered
+            'drinks-INITIAL_FORMS': '0', # the number of forms with initial data
+            'drinks-MAX_NUM_FORMS': '0', # max number of forms
+            'drinks-0-name': 'Gin and Tonic',
+            'drinks-1-name': 'Bloody Mary',
+        }
+
+        formset = FavoriteDrinksFormSet(data, prefix='drinks')
+        self.assertTrue(formset.is_valid())
+        self.assertEqual(formset.non_form_errors(), [])
+
+    def test_limiting_max_forms(self):
+        # Limiting the maximum number of forms ########################################
+        # Base case for max_num.
+
+        # When not passed, max_num will take its default value of None, i.e. unlimited
+        # number of forms, only controlled by the value of the extra parameter.
+
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=3)
+        formset = LimitedFavoriteDrinkFormSet()
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input type="text" name="form-0-name" id="id_form-0-name" /></td></tr>
+<tr><th><label for="id_form-1-name">Name:</label></th><td><input type="text" name="form-1-name" id="id_form-1-name" /></td></tr>
+<tr><th><label for="id_form-2-name">Name:</label></th><td><input type="text" name="form-2-name" id="id_form-2-name" /></td></tr>""")
+
+        # If max_num is 0 then no form is rendered at all.
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=3, max_num=0)
+        formset = LimitedFavoriteDrinkFormSet()
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), "")
+
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=5, max_num=2)
+        formset = LimitedFavoriteDrinkFormSet()
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input type="text" name="form-0-name" id="id_form-0-name" /></td></tr>
+<tr><th><label for="id_form-1-name">Name:</label></th><td><input type="text" name="form-1-name" id="id_form-1-name" /></td></tr>""")
+
+        # Ensure that max_num has no effect when extra is less than max_num.
+
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=1, max_num=2)
+        formset = LimitedFavoriteDrinkFormSet()
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input type="text" name="form-0-name" id="id_form-0-name" /></td></tr>""")
+
+    def test_max_num_with_initial_data(self):
+        # max_num with initial data
+
+        # When not passed, max_num will take its default value of None, i.e. unlimited
+        # number of forms, only controlled by the values of the initial and extra
+        # parameters.
+
+        initial = [
+            {'name': 'Fernet and Coke'},
+        ]
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=1)
+        formset = LimitedFavoriteDrinkFormSet(initial=initial)
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input type="text" name="form-0-name" value="Fernet and Coke" id="id_form-0-name" /></td></tr>
+<tr><th><label for="id_form-1-name">Name:</label></th><td><input type="text" name="form-1-name" id="id_form-1-name" /></td></tr>""")
+
+    def test_max_num_zero(self):
+        # If max_num is 0 then no form is rendered at all, even if extra and initial
+        # are specified.
+
+        initial = [
+            {'name': 'Fernet and Coke'},
+            {'name': 'Bloody Mary'},
+        ]
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=1, max_num=0)
+        formset = LimitedFavoriteDrinkFormSet(initial=initial)
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), "")
+
+    def test_more_initial_than_max_num(self):
+        # More initial forms than max_num will result in only the first max_num of
+        # them to be displayed with no extra forms.
+
+        initial = [
+            {'name': 'Gin Tonic'},
+            {'name': 'Bloody Mary'},
+            {'name': 'Jack and Coke'},
+        ]
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=1, max_num=2)
+        formset = LimitedFavoriteDrinkFormSet(initial=initial)
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input type="text" name="form-0-name" value="Gin Tonic" id="id_form-0-name" /></td></tr>
+<tr><th><label for="id_form-1-name">Name:</label></th><td><input type="text" name="form-1-name" value="Bloody Mary" id="id_form-1-name" /></td></tr>""")
+
+        # One form from initial and extra=3 with max_num=2 should result in the one
+        # initial form and one extra.
+        initial = [
+            {'name': 'Gin Tonic'},
+        ]
+        LimitedFavoriteDrinkFormSet = formset_factory(FavoriteDrinkForm, extra=3, max_num=2)
+        formset = LimitedFavoriteDrinkFormSet(initial=initial)
+        form_output = []
+
+        for form in formset.forms:
+            form_output.append(str(form))
+
+        self.assertEqual('\n'.join(form_output), """<tr><th><label for="id_form-0-name">Name:</label></th><td><input type="text" name="form-0-name" value="Gin Tonic" id="id_form-0-name" /></td></tr>
+<tr><th><label for="id_form-1-name">Name:</label></th><td><input type="text" name="form-1-name" id="id_form-1-name" /></td></tr>""")
+
+    def test_regression_6926(self):
+        # Regression test for #6926 ##################################################
+        # Make sure the management form has the correct prefix.
+
+        formset = FavoriteDrinksFormSet()
+        self.assertEqual(formset.management_form.prefix, 'form')
+
+        formset = FavoriteDrinksFormSet(data={})
+        self.assertEqual(formset.management_form.prefix, 'form')
+
+        formset = FavoriteDrinksFormSet(initial={})
+        self.assertEqual(formset.management_form.prefix, 'form')
+
+    def test_regression_12878(self):
+        # Regression test for #12878 #################################################
+
+        data = {
+            'drinks-TOTAL_FORMS': '2', # the number of forms rendered
+            'drinks-INITIAL_FORMS': '0', # the number of forms with initial data
+            'drinks-MAX_NUM_FORMS': '0', # max number of forms
+            'drinks-0-name': 'Gin and Tonic',
+            'drinks-1-name': 'Gin and Tonic',
+        }
+
+        formset = FavoriteDrinksFormSet(data, prefix='drinks')
+        self.assertFalse(formset.is_valid())
+        self.assertEqual(formset.non_form_errors(), [u'You may only specify a drink once.'])
diff --git a/parts/django/tests/regressiontests/forms/tests/input_formats.py b/parts/django/tests/regressiontests/forms/tests/input_formats.py
new file mode 100644
index 0000000..498c6de
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/input_formats.py
@@ -0,0 +1,894 @@
+from datetime import time, date, datetime
+from unittest import TestCase
+
+from django import forms
+from django.conf import settings
+from django.utils.translation import activate, deactivate
+
+
+class LocalizedTimeTests(TestCase):
+    def setUp(self):
+        self.old_TIME_INPUT_FORMATS = settings.TIME_INPUT_FORMATS
+        self.old_USE_L10N = settings.USE_L10N
+
+        settings.TIME_INPUT_FORMATS = ["%I:%M:%S %p", "%I:%M %p"]
+        settings.USE_L10N = True
+
+        activate('de')
+
+    def tearDown(self):
+        settings.TIME_INPUT_FORMATS = self.old_TIME_INPUT_FORMATS
+        settings.USE_L10N = self.old_USE_L10N
+
+        deactivate()
+
+    def test_timeField(self):
+        "TimeFields can parse dates in the default format"
+        f = forms.TimeField()
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13:30:05')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '13:30:05')
+
+        # Parse a time in a valid, but non-default format, get a parsed result
+        result = f.clean('13:30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+    def test_localized_timeField(self):
+        "Localized TimeFields act as unlocalized widgets"
+        f = forms.TimeField(localize=True)
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13:30:05')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13:30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+    def test_timeField_with_inputformat(self):
+        "TimeFields with manually specified input formats can accept those formats"
+        f = forms.TimeField(input_formats=["%H.%M.%S", "%H.%M"])
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30.05')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:05")
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+    def test_localized_timeField_with_inputformat(self):
+        "Localized TimeFields with manually specified input formats can accept those formats"
+        f = forms.TimeField(input_formats=["%H.%M.%S", "%H.%M"], localize=True)
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30.05')
+        self.assertEqual(result, time(13,30,5))
+
+        # # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:05")
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+
+class CustomTimeInputFormatsTests(TestCase):
+    def setUp(self):
+        self.old_TIME_INPUT_FORMATS = settings.TIME_INPUT_FORMATS
+        settings.TIME_INPUT_FORMATS = ["%I:%M:%S %p", "%I:%M %p"]
+
+    def tearDown(self):
+        settings.TIME_INPUT_FORMATS = self.old_TIME_INPUT_FORMATS
+
+    def test_timeField(self):
+        "TimeFields can parse dates in the default format"
+        f = forms.TimeField()
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '01:30:05 PM')
+
+        # Parse a time in a valid, but non-default format, get a parsed result
+        result = f.clean('1:30 PM')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM")
+
+    def test_localized_timeField(self):
+        "Localized TimeFields act as unlocalized widgets"
+        f = forms.TimeField(localize=True)
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '01:30:05 PM')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('01:30 PM')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM")
+
+    def test_timeField_with_inputformat(self):
+        "TimeFields with manually specified input formats can accept those formats"
+        f = forms.TimeField(input_formats=["%H.%M.%S", "%H.%M"])
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30.05')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:05 PM")
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM")
+
+    def test_localized_timeField_with_inputformat(self):
+        "Localized TimeFields with manually specified input formats can accept those formats"
+        f = forms.TimeField(input_formats=["%H.%M.%S", "%H.%M"], localize=True)
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30.05')
+        self.assertEqual(result, time(13,30,5))
+
+        # # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:05 PM")
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13.30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM")
+
+
+class SimpleTimeFormatTests(TestCase):
+    def test_timeField(self):
+        "TimeFields can parse dates in the default format"
+        f = forms.TimeField()
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13:30:05')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:05")
+
+        # Parse a time in a valid, but non-default format, get a parsed result
+        result = f.clean('13:30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+    def test_localized_timeField(self):
+        "Localized TimeFields in a non-localized environment act as unlocalized widgets"
+        f = forms.TimeField()
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13:30:05')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:05")
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('13:30')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+    def test_timeField_with_inputformat(self):
+        "TimeFields with manually specified input formats can accept those formats"
+        f = forms.TimeField(input_formats=["%I:%M:%S %p", "%I:%M %p"])
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:05")
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('1:30 PM')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+    def test_localized_timeField_with_inputformat(self):
+        "Localized TimeFields with manually specified input formats can accept those formats"
+        f = forms.TimeField(input_formats=["%I:%M:%S %p", "%I:%M %p"], localize=True)
+        # Parse a time in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05')
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM')
+        self.assertEqual(result, time(13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:05")
+
+        # Parse a time in a valid format, get a parsed result
+        result = f.clean('1:30 PM')
+        self.assertEqual(result, time(13,30,0))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "13:30:00")
+
+
+class LocalizedDateTests(TestCase):
+    def setUp(self):
+        self.old_DATE_INPUT_FORMATS = settings.DATE_INPUT_FORMATS
+        self.old_USE_L10N = settings.USE_L10N
+
+        settings.DATE_INPUT_FORMATS = ["%d/%m/%Y", "%d-%m-%Y"]
+        settings.USE_L10N = True
+
+        activate('de')
+
+    def tearDown(self):
+        settings.DATE_INPUT_FORMATS = self.old_DATE_INPUT_FORMATS
+        settings.USE_L10N = self.old_USE_L10N
+
+        deactivate()
+
+    def test_dateField(self):
+        "DateFields can parse dates in the default format"
+        f = forms.DateField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '21/12/2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '21.12.2010')
+
+        # Parse a date in a valid, but non-default format, get a parsed result
+        result = f.clean('21.12.10')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+    def test_localized_dateField(self):
+        "Localized DateFields act as unlocalized widgets"
+        f = forms.DateField(localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '21/12/2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.10')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+    def test_dateField_with_inputformat(self):
+        "DateFields with manually specified input formats can accept those formats"
+        f = forms.DateField(input_formats=["%m.%d.%Y", "%m-%d-%Y"])
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+        self.assertRaises(forms.ValidationError, f.clean, '21/12/2010')
+        self.assertRaises(forms.ValidationError, f.clean, '21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12.21.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12-21-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+    def test_localized_dateField_with_inputformat(self):
+        "Localized DateFields with manually specified input formats can accept those formats"
+        f = forms.DateField(input_formats=["%m.%d.%Y", "%m-%d-%Y"], localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+        self.assertRaises(forms.ValidationError, f.clean, '21/12/2010')
+        self.assertRaises(forms.ValidationError, f.clean, '21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12.21.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12-21-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+class CustomDateInputFormatsTests(TestCase):
+    def setUp(self):
+        self.old_DATE_INPUT_FORMATS = settings.DATE_INPUT_FORMATS
+        settings.DATE_INPUT_FORMATS = ["%d.%m.%Y", "%d-%m-%Y"]
+
+    def tearDown(self):
+        settings.DATE_INPUT_FORMATS = self.old_DATE_INPUT_FORMATS
+
+    def test_dateField(self):
+        "DateFields can parse dates in the default format"
+        f = forms.DateField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '21.12.2010')
+
+        # Parse a date in a valid, but non-default format, get a parsed result
+        result = f.clean('21-12-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+    def test_localized_dateField(self):
+        "Localized DateFields act as unlocalized widgets"
+        f = forms.DateField(localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21-12-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+    def test_dateField_with_inputformat(self):
+        "DateFields with manually specified input formats can accept those formats"
+        f = forms.DateField(input_formats=["%m.%d.%Y", "%m-%d-%Y"])
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '21.12.2010')
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12.21.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12-21-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+    def test_localized_dateField_with_inputformat(self):
+        "Localized DateFields with manually specified input formats can accept those formats"
+        f = forms.DateField(input_formats=["%m.%d.%Y", "%m-%d-%Y"], localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '21.12.2010')
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12.21.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12-21-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010")
+
+class SimpleDateFormatTests(TestCase):
+    def test_dateField(self):
+        "DateFields can parse dates in the default format"
+        f = forms.DateField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('2010-12-21')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+        # Parse a date in a valid, but non-default format, get a parsed result
+        result = f.clean('12/21/2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+    def test_localized_dateField(self):
+        "Localized DateFields in a non-localized environment act as unlocalized widgets"
+        f = forms.DateField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('2010-12-21')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12/21/2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+    def test_dateField_with_inputformat(self):
+        "DateFields with manually specified input formats can accept those formats"
+        f = forms.DateField(input_formats=["%d.%m.%Y", "%d-%m-%Y"])
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21-12-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+    def test_localized_dateField_with_inputformat(self):
+        "Localized DateFields with manually specified input formats can accept those formats"
+        f = forms.DateField(input_formats=["%d.%m.%Y", "%d-%m-%Y"], localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21-12-2010')
+        self.assertEqual(result, date(2010,12,21))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21")
+
+class LocalizedDateTimeTests(TestCase):
+    def setUp(self):
+        self.old_DATETIME_INPUT_FORMATS = settings.DATETIME_INPUT_FORMATS
+        self.old_USE_L10N = settings.USE_L10N
+
+        settings.DATETIME_INPUT_FORMATS = ["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"]
+        settings.USE_L10N = True
+
+        activate('de')
+
+    def tearDown(self):
+        settings.DATETIME_INPUT_FORMATS = self.old_DATETIME_INPUT_FORMATS
+        settings.USE_L10N = self.old_USE_L10N
+
+        deactivate()
+
+    def test_dateTimeField(self):
+        "DateTimeFields can parse dates in the default format"
+        f = forms.DateTimeField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM 21/12/2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '21.12.2010 13:30:05')
+
+        # Parse a date in a valid, but non-default format, get a parsed result
+        result = f.clean('21.12.2010 13:30')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010 13:30:00")
+
+    def test_localized_dateTimeField(self):
+        "Localized DateTimeFields act as unlocalized widgets"
+        f = forms.DateTimeField(localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM 21/12/2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '21.12.2010 13:30:05')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('21.12.2010 13:30')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010 13:30:00")
+
+    def test_dateTimeField_with_inputformat(self):
+        "DateTimeFields with manually specified input formats can accept those formats"
+        f = forms.DateTimeField(input_formats=["%H.%M.%S %m.%d.%Y", "%H.%M %m-%d-%Y"])
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05 13:30:05')
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM 21/12/2010')
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05 21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('13.30.05 12.21.2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010 13:30:05")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('13.30 12-21-2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010 13:30:00")
+
+    def test_localized_dateTimeField_with_inputformat(self):
+        "Localized DateTimeFields with manually specified input formats can accept those formats"
+        f = forms.DateTimeField(input_formats=["%H.%M.%S %m.%d.%Y", "%H.%M %m-%d-%Y"], localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05')
+        self.assertRaises(forms.ValidationError, f.clean, '1:30:05 PM 21/12/2010')
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05 21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('13.30.05 12.21.2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010 13:30:05")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('13.30 12-21-2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "21.12.2010 13:30:00")
+
+
+class CustomDateTimeInputFormatsTests(TestCase):
+    def setUp(self):
+        self.old_DATETIME_INPUT_FORMATS = settings.DATETIME_INPUT_FORMATS
+        settings.DATETIME_INPUT_FORMATS = ["%I:%M:%S %p %d/%m/%Y", "%I:%M %p %d-%m-%Y"]
+
+    def tearDown(self):
+        settings.DATETIME_INPUT_FORMATS = self.old_DATETIME_INPUT_FORMATS
+
+    def test_dateTimeField(self):
+        "DateTimeFields can parse dates in the default format"
+        f = forms.DateTimeField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM 21/12/2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '01:30:05 PM 21/12/2010')
+
+        # Parse a date in a valid, but non-default format, get a parsed result
+        result = f.clean('1:30 PM 21-12-2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM 21/12/2010")
+
+    def test_localized_dateTimeField(self):
+        "Localized DateTimeFields act as unlocalized widgets"
+        f = forms.DateTimeField(localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM 21/12/2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, '01:30:05 PM 21/12/2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('1:30 PM 21-12-2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM 21/12/2010")
+
+    def test_dateTimeField_with_inputformat(self):
+        "DateTimeFields with manually specified input formats can accept those formats"
+        f = forms.DateTimeField(input_formats=["%m.%d.%Y %H:%M:%S", "%m-%d-%Y %H:%M"])
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05 21.12.2010')
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12.21.2010 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:05 PM 21/12/2010")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12-21-2010 13:30')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM 21/12/2010")
+
+    def test_localized_dateTimeField_with_inputformat(self):
+        "Localized DateTimeFields with manually specified input formats can accept those formats"
+        f = forms.DateTimeField(input_formats=["%m.%d.%Y %H:%M:%S", "%m-%d-%Y %H:%M"], localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05 21.12.2010')
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12.21.2010 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:05 PM 21/12/2010")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12-21-2010 13:30')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "01:30:00 PM 21/12/2010")
+
+class SimpleDateTimeFormatTests(TestCase):
+    def test_dateTimeField(self):
+        "DateTimeFields can parse dates in the default format"
+        f = forms.DateTimeField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05 21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('2010-12-21 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:05")
+
+        # Parse a date in a valid, but non-default format, get a parsed result
+        result = f.clean('12/21/2010 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:05")
+
+    def test_localized_dateTimeField(self):
+        "Localized DateTimeFields in a non-localized environment act as unlocalized widgets"
+        f = forms.DateTimeField()
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '13:30:05 21.12.2010')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('2010-12-21 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:05")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('12/21/2010 13:30:05')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:05")
+
+    def test_dateTimeField_with_inputformat(self):
+        "DateTimeFields with manually specified input formats can accept those formats"
+        f = forms.DateTimeField(input_formats=["%I:%M:%S %p %d.%m.%Y", "%I:%M %p %d-%m-%Y"])
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM 21.12.2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:05")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('1:30 PM 21-12-2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:00")
+
+    def test_localized_dateTimeField_with_inputformat(self):
+        "Localized DateTimeFields with manually specified input formats can accept those formats"
+        f = forms.DateTimeField(input_formats=["%I:%M:%S %p %d.%m.%Y", "%I:%M %p %d-%m-%Y"], localize=True)
+        # Parse a date in an unaccepted format; get an error
+        self.assertRaises(forms.ValidationError, f.clean, '2010-12-21 13:30:05')
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('1:30:05 PM 21.12.2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30,5))
+
+        # Check that the parsed result does a round trip to the same format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:05")
+
+        # Parse a date in a valid format, get a parsed result
+        result = f.clean('1:30 PM 21-12-2010')
+        self.assertEqual(result, datetime(2010,12,21,13,30))
+
+        # Check that the parsed result does a round trip to default format
+        text = f.widget._format_value(result)
+        self.assertEqual(text, "2010-12-21 13:30:00")
diff --git a/parts/django/tests/regressiontests/forms/tests/media.py b/parts/django/tests/regressiontests/forms/tests/media.py
new file mode 100644
index 0000000..eb59d13
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/media.py
@@ -0,0 +1,460 @@
+# -*- coding: utf-8 -*-
+from unittest import TestCase
+from django.conf import settings
+from django.forms import TextInput, Media, TextInput, CharField, Form, MultiWidget
+
+
+class FormsMediaTestCase(TestCase):
+    # Tests for the media handling on widgets and forms
+    def setUp(self):
+        super(FormsMediaTestCase, self).setUp()
+        self.original_media_url = settings.MEDIA_URL
+        settings.MEDIA_URL = 'http://media.example.com/media/'
+
+    def tearDown(self):
+        settings.MEDIA_URL = self.original_media_url
+        super(FormsMediaTestCase, self).tearDown()
+
+    def test_construction(self):
+        # Check construction of media objects
+        m = Media(css={'all': ('path/to/css1','/path/to/css2')}, js=('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3'))
+        self.assertEqual(str(m), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>""")
+
+        class Foo:
+            css = {
+               'all': ('path/to/css1','/path/to/css2')
+            }
+            js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        m3 = Media(Foo)
+        self.assertEqual(str(m3), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>""")
+
+        # A widget can exist without a media definition
+        class MyWidget(TextInput):
+            pass
+
+        w = MyWidget()
+        self.assertEqual(str(w.media), '')
+
+    def test_media_dsl(self):
+        ###############################################################
+        # DSL Class-based media definitions
+        ###############################################################
+
+        # A widget can define media if it needs to.
+        # Any absolute path will be preserved; relative paths are combined
+        # with the value of settings.MEDIA_URL
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        w1 = MyWidget1()
+        self.assertEqual(str(w1.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>""")
+
+        # Media objects can be interrogated by media type
+        self.assertEqual(str(w1.media['css']), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />""")
+
+        self.assertEqual(str(w1.media['js']), """<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>""")
+
+    def test_combine_media(self):
+        # Media objects can be combined. Any given media resource will appear only
+        # once. Duplicated media definitions are ignored.
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget2(TextInput):
+            class Media:
+                css = {
+                   'all': ('/path/to/css2','/path/to/css3')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        class MyWidget3(TextInput):
+            class Media:
+                css = {
+                   'all': ('/path/to/css3','path/to/css1')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        w1 = MyWidget1()
+        w2 = MyWidget2()
+        w3 = MyWidget3()
+        self.assertEqual(str(w1.media + w2.media + w3.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+        # Check that media addition hasn't affected the original objects
+        self.assertEqual(str(w1.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>""")
+
+        # Regression check for #12879: specifying the same CSS or JS file
+        # multiple times in a single Media instance should result in that file
+        # only being included once.
+        class MyWidget4(TextInput):
+            class Media:
+                css = {'all': ('/path/to/css1', '/path/to/css1')}
+                js = ('/path/to/js1', '/path/to/js1')
+
+        w4 = MyWidget4()
+        self.assertEqual(str(w4.media), """<link href="/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>""")
+
+    def test_media_property(self):
+        ###############################################################
+        # Property-based media definitions
+        ###############################################################
+
+        # Widget media can be defined as a property
+        class MyWidget4(TextInput):
+            def _media(self):
+                return Media(css={'all': ('/some/path',)}, js = ('/some/js',))
+            media = property(_media)
+
+        w4 = MyWidget4()
+        self.assertEqual(str(w4.media), """<link href="/some/path" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/some/js"></script>""")
+
+        # Media properties can reference the media of their parents
+        class MyWidget5(MyWidget4):
+            def _media(self):
+                return super(MyWidget5, self).media + Media(css={'all': ('/other/path',)}, js = ('/other/js',))
+            media = property(_media)
+
+        w5 = MyWidget5()
+        self.assertEqual(str(w5.media), """<link href="/some/path" type="text/css" media="all" rel="stylesheet" />
+<link href="/other/path" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/some/js"></script>
+<script type="text/javascript" src="/other/js"></script>""")
+
+    def test_media_property_parent_references(self):
+        # Media properties can reference the media of their parents,
+        # even if the parent media was defined using a class
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget6(MyWidget1):
+            def _media(self):
+                return super(MyWidget6, self).media + Media(css={'all': ('/other/path',)}, js = ('/other/js',))
+            media = property(_media)
+
+        w6 = MyWidget6()
+        self.assertEqual(str(w6.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/other/path" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/other/js"></script>""")
+
+    def test_media_inheritance(self):
+        ###############################################################
+        # Inheritance of media
+        ###############################################################
+
+        # If a widget extends another but provides no media definition, it inherits the parent widget's media
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget7(MyWidget1):
+            pass
+
+        w7 = MyWidget7()
+        self.assertEqual(str(w7.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>""")
+
+        # If a widget extends another but defines media, it extends the parent widget's media by default
+        class MyWidget8(MyWidget1):
+            class Media:
+                css = {
+                   'all': ('/path/to/css3','path/to/css1')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        w8 = MyWidget8()
+        self.assertEqual(str(w8.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+    def test_media_inheritance_from_property(self):
+        # If a widget extends another but defines media, it extends the parents widget's media,
+        # even if the parent defined media using a property.
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget4(TextInput):
+            def _media(self):
+                return Media(css={'all': ('/some/path',)}, js = ('/some/js',))
+            media = property(_media)
+
+        class MyWidget9(MyWidget4):
+            class Media:
+                css = {
+                    'all': ('/other/path',)
+                }
+                js = ('/other/js',)
+
+        w9 = MyWidget9()
+        self.assertEqual(str(w9.media), """<link href="/some/path" type="text/css" media="all" rel="stylesheet" />
+<link href="/other/path" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/some/js"></script>
+<script type="text/javascript" src="/other/js"></script>""")
+
+        # A widget can disable media inheritance by specifying 'extend=False'
+        class MyWidget10(MyWidget1):
+            class Media:
+                extend = False
+                css = {
+                   'all': ('/path/to/css3','path/to/css1')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        w10 = MyWidget10()
+        self.assertEqual(str(w10.media), """<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+    def test_media_inheritance_extends(self):
+        # A widget can explicitly enable full media inheritance by specifying 'extend=True'
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget11(MyWidget1):
+            class Media:
+                extend = True
+                css = {
+                   'all': ('/path/to/css3','path/to/css1')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        w11 = MyWidget11()
+        self.assertEqual(str(w11.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+    def test_media_inheritance_single_type(self):
+        # A widget can enable inheritance of one media type by specifying extend as a tuple
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget12(MyWidget1):
+            class Media:
+                extend = ('css',)
+                css = {
+                   'all': ('/path/to/css3','path/to/css1')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        w12 = MyWidget12()
+        self.assertEqual(str(w12.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+    def test_multi_media(self):
+        ###############################################################
+        # Multi-media handling for CSS
+        ###############################################################
+
+        # A widget can define CSS media for multiple output media types
+        class MultimediaWidget(TextInput):
+            class Media:
+                css = {
+                   'screen, print': ('/file1','/file2'),
+                   'screen': ('/file3',),
+                   'print': ('/file4',)
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        multimedia = MultimediaWidget()
+        self.assertEqual(str(multimedia.media), """<link href="/file4" type="text/css" media="print" rel="stylesheet" />
+<link href="/file3" type="text/css" media="screen" rel="stylesheet" />
+<link href="/file1" type="text/css" media="screen, print" rel="stylesheet" />
+<link href="/file2" type="text/css" media="screen, print" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+    def test_multi_widget(self):
+        ###############################################################
+        # Multiwidget media handling
+        ###############################################################
+
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget2(TextInput):
+            class Media:
+                css = {
+                   'all': ('/path/to/css2','/path/to/css3')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        class MyWidget3(TextInput):
+            class Media:
+                css = {
+                   'all': ('/path/to/css3','path/to/css1')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        # MultiWidgets have a default media definition that gets all the
+        # media from the component widgets
+        class MyMultiWidget(MultiWidget):
+            def __init__(self, attrs=None):
+                widgets = [MyWidget1, MyWidget2, MyWidget3]
+                super(MyMultiWidget, self).__init__(widgets, attrs)
+
+        mymulti = MyMultiWidget()
+        self.assertEqual(str(mymulti.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+    def test_form_media(self):
+        ###############################################################
+        # Media processing for forms
+        ###############################################################
+
+        class MyWidget1(TextInput):
+            class Media:
+                css = {
+                   'all': ('path/to/css1','/path/to/css2')
+                }
+                js = ('/path/to/js1','http://media.other.com/path/to/js2','https://secure.other.com/path/to/js3')
+
+        class MyWidget2(TextInput):
+            class Media:
+                css = {
+                   'all': ('/path/to/css2','/path/to/css3')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        class MyWidget3(TextInput):
+            class Media:
+                css = {
+                   'all': ('/path/to/css3','path/to/css1')
+                }
+                js = ('/path/to/js1','/path/to/js4')
+
+        # You can ask a form for the media required by its widgets.
+        class MyForm(Form):
+            field1 = CharField(max_length=20, widget=MyWidget1())
+            field2 = CharField(max_length=20, widget=MyWidget2())
+        f1 = MyForm()
+        self.assertEqual(str(f1.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+        # Form media can be combined to produce a single media definition.
+        class AnotherForm(Form):
+            field3 = CharField(max_length=20, widget=MyWidget3())
+        f2 = AnotherForm()
+        self.assertEqual(str(f1.media + f2.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>""")
+
+        # Forms can also define media, following the same rules as widgets.
+        class FormWithMedia(Form):
+            field1 = CharField(max_length=20, widget=MyWidget1())
+            field2 = CharField(max_length=20, widget=MyWidget2())
+            class Media:
+                js = ('/some/form/javascript',)
+                css = {
+                    'all': ('/some/form/css',)
+                }
+        f3 = FormWithMedia()
+        self.assertEqual(str(f3.media), """<link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<link href="/some/form/css" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>
+<script type="text/javascript" src="/some/form/javascript"></script>""")
+
+        # Media works in templates
+        from django.template import Template, Context
+        self.assertEqual(Template("{{ form.media.js }}{{ form.media.css }}").render(Context({'form': f3})), """<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
+<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
+<script type="text/javascript" src="/path/to/js4"></script>
+<script type="text/javascript" src="/some/form/javascript"></script><link href="http://media.example.com/media/path/to/css1" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<link href="/some/form/css" type="text/css" media="all" rel="stylesheet" />""")
diff --git a/parts/django/tests/regressiontests/forms/tests/models.py b/parts/django/tests/regressiontests/forms/tests/models.py
new file mode 100644
index 0000000..af7473e
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/models.py
@@ -0,0 +1,169 @@
+# -*- coding: utf-8 -*-
+import datetime
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.conf import settings
+from django.db import connection
+from django.forms import Form, ModelForm, FileField, ModelChoiceField
+from django.test import TestCase
+from regressiontests.forms.models import ChoiceModel, ChoiceOptionModel, ChoiceFieldModel, FileModel, Group, BoundaryModel, Defaults
+
+
+class ChoiceFieldForm(ModelForm):
+    class Meta:
+        model = ChoiceFieldModel
+
+
+class FileForm(Form):
+    file1 = FileField()
+
+
+class TestTicket12510(TestCase):
+    ''' It is not necessary to generate choices for ModelChoiceField (regression test for #12510). '''
+    def setUp(self):
+        self.groups = [Group.objects.create(name=name) for name in 'abc']
+        self.old_debug = settings.DEBUG
+        # turn debug on to get access to connection.queries
+        settings.DEBUG = True
+
+    def tearDown(self):
+        settings.DEBUG = self.old_debug
+
+    def test_choices_not_fetched_when_not_rendering(self):
+        initial_queries = len(connection.queries)
+        field = ModelChoiceField(Group.objects.order_by('-name'))
+        self.assertEqual('a', field.clean(self.groups[0].pk).name)
+        # only one query is required to pull the model from DB
+        self.assertEqual(initial_queries+1, len(connection.queries))
+
+class ModelFormCallableModelDefault(TestCase):
+    def test_no_empty_option(self):
+        "If a model's ForeignKey has blank=False and a default, no empty option is created (Refs #10792)."
+        option = ChoiceOptionModel.objects.create(name='default')
+
+        choices = list(ChoiceFieldForm().fields['choice'].choices)
+        self.assertEquals(len(choices), 1)
+        self.assertEquals(choices[0], (option.pk, unicode(option)))
+
+    def test_callable_initial_value(self):
+        "The initial value for a callable default returning a queryset is the pk (refs #13769)"
+        obj1 = ChoiceOptionModel.objects.create(id=1, name='default')
+        obj2 = ChoiceOptionModel.objects.create(id=2, name='option 2')
+        obj3 = ChoiceOptionModel.objects.create(id=3, name='option 3')
+        self.assertEquals(ChoiceFieldForm().as_p(), """<p><label for="id_choice">Choice:</label> <select name="choice" id="id_choice">
+<option value="1" selected="selected">ChoiceOption 1</option>
+<option value="2">ChoiceOption 2</option>
+<option value="3">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-choice" value="1" id="initial-id_choice" /></p>
+<p><label for="id_choice_int">Choice int:</label> <select name="choice_int" id="id_choice_int">
+<option value="1" selected="selected">ChoiceOption 1</option>
+<option value="2">ChoiceOption 2</option>
+<option value="3">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-choice_int" value="1" id="initial-id_choice_int" /></p>
+<p><label for="id_multi_choice">Multi choice:</label> <select multiple="multiple" name="multi_choice" id="id_multi_choice">
+<option value="1" selected="selected">ChoiceOption 1</option>
+<option value="2">ChoiceOption 2</option>
+<option value="3">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-multi_choice" value="1" id="initial-id_multi_choice_0" />  Hold down "Control", or "Command" on a Mac, to select more than one.</p>
+<p><label for="id_multi_choice_int">Multi choice int:</label> <select multiple="multiple" name="multi_choice_int" id="id_multi_choice_int">
+<option value="1" selected="selected">ChoiceOption 1</option>
+<option value="2">ChoiceOption 2</option>
+<option value="3">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-multi_choice_int" value="1" id="initial-id_multi_choice_int_0" />  Hold down "Control", or "Command" on a Mac, to select more than one.</p>""")
+
+    def test_initial_instance_value(self):
+        "Initial instances for model fields may also be instances (refs #7287)"
+        obj1 = ChoiceOptionModel.objects.create(id=1, name='default')
+        obj2 = ChoiceOptionModel.objects.create(id=2, name='option 2')
+        obj3 = ChoiceOptionModel.objects.create(id=3, name='option 3')
+        self.assertEquals(ChoiceFieldForm(initial={
+                'choice': obj2,
+                'choice_int': obj2,
+                'multi_choice': [obj2,obj3],
+                'multi_choice_int': ChoiceOptionModel.objects.exclude(name="default"),
+            }).as_p(), """<p><label for="id_choice">Choice:</label> <select name="choice" id="id_choice">
+<option value="1">ChoiceOption 1</option>
+<option value="2" selected="selected">ChoiceOption 2</option>
+<option value="3">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-choice" value="2" id="initial-id_choice" /></p>
+<p><label for="id_choice_int">Choice int:</label> <select name="choice_int" id="id_choice_int">
+<option value="1">ChoiceOption 1</option>
+<option value="2" selected="selected">ChoiceOption 2</option>
+<option value="3">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-choice_int" value="2" id="initial-id_choice_int" /></p>
+<p><label for="id_multi_choice">Multi choice:</label> <select multiple="multiple" name="multi_choice" id="id_multi_choice">
+<option value="1">ChoiceOption 1</option>
+<option value="2" selected="selected">ChoiceOption 2</option>
+<option value="3" selected="selected">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-multi_choice" value="2" id="initial-id_multi_choice_0" />
+<input type="hidden" name="initial-multi_choice" value="3" id="initial-id_multi_choice_1" />  Hold down "Control", or "Command" on a Mac, to select more than one.</p>
+<p><label for="id_multi_choice_int">Multi choice int:</label> <select multiple="multiple" name="multi_choice_int" id="id_multi_choice_int">
+<option value="1">ChoiceOption 1</option>
+<option value="2" selected="selected">ChoiceOption 2</option>
+<option value="3" selected="selected">ChoiceOption 3</option>
+</select><input type="hidden" name="initial-multi_choice_int" value="2" id="initial-id_multi_choice_int_0" />
+<input type="hidden" name="initial-multi_choice_int" value="3" id="initial-id_multi_choice_int_1" />  Hold down "Control", or "Command" on a Mac, to select more than one.</p>""")
+
+
+
+class FormsModelTestCase(TestCase):
+    def test_unicode_filename(self):
+        # FileModel with unicode filename and data #########################
+        f = FileForm(data={}, files={'file1': SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह')}, auto_id=False)
+        self.assertTrue(f.is_valid())
+        self.assertTrue('file1' in f.cleaned_data)
+        m = FileModel.objects.create(file=f.cleaned_data['file1'])
+        self.assertEqual(m.file.name, u'tests/\u6211\u96bb\u6c23\u588a\u8239\u88dd\u6eff\u6652\u9c54.txt')
+        m.delete()
+
+    def test_boundary_conditions(self):
+        # Boundary conditions on a PostitiveIntegerField #########################
+        class BoundaryForm(ModelForm):
+            class Meta:
+                model = BoundaryModel
+
+        f = BoundaryForm({'positive_integer': 100})
+        self.assertTrue(f.is_valid())
+        f = BoundaryForm({'positive_integer': 0})
+        self.assertTrue(f.is_valid())
+        f = BoundaryForm({'positive_integer': -100})
+        self.assertFalse(f.is_valid())
+
+    def test_formfield_initial(self):
+        # Formfield initial values ########
+        # If the model has default values for some fields, they are used as the formfield
+        # initial values.
+        class DefaultsForm(ModelForm):
+            class Meta:
+                model = Defaults
+
+        self.assertEqual(DefaultsForm().fields['name'].initial, u'class default value')
+        self.assertEqual(DefaultsForm().fields['def_date'].initial, datetime.date(1980, 1, 1))
+        self.assertEqual(DefaultsForm().fields['value'].initial, 42)
+        r1 = DefaultsForm()['callable_default'].as_widget()
+        r2 = DefaultsForm()['callable_default'].as_widget()
+        self.assertNotEqual(r1, r2)
+
+        # In a ModelForm that is passed an instance, the initial values come from the
+        # instance's values, not the model's defaults.
+        foo_instance = Defaults(name=u'instance value', def_date=datetime.date(1969, 4, 4), value=12)
+        instance_form = DefaultsForm(instance=foo_instance)
+        self.assertEqual(instance_form.initial['name'], u'instance value')
+        self.assertEqual(instance_form.initial['def_date'], datetime.date(1969, 4, 4))
+        self.assertEqual(instance_form.initial['value'], 12)
+
+        from django.forms import CharField
+
+        class ExcludingForm(ModelForm):
+            name = CharField(max_length=255)
+
+            class Meta:
+                model = Defaults
+                exclude = ['name', 'callable_default']
+
+        f = ExcludingForm({'name': u'Hello', 'value': 99, 'def_date': datetime.date(1999, 3, 2)})
+        self.assertTrue(f.is_valid())
+        self.assertEqual(f.cleaned_data['name'], u'Hello')
+        obj = f.save()
+        self.assertEqual(obj.name, u'class default value')
+        self.assertEqual(obj.value, 99)
+        self.assertEqual(obj.def_date, datetime.date(1999, 3, 2))
diff --git a/parts/django/tests/regressiontests/forms/tests/regressions.py b/parts/django/tests/regressiontests/forms/tests/regressions.py
new file mode 100644
index 0000000..ddec740
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/regressions.py
@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+from unittest import TestCase
+from django.forms import *
+from django.utils.translation import ugettext_lazy, activate, deactivate
+
+from regressiontests.forms.models import Cheese
+
+
+class FormsRegressionsTestCase(TestCase):
+    def test_class(self):
+        # Tests to prevent against recurrences of earlier bugs.
+        extra_attrs = {'class': 'special'}
+
+        class TestForm(Form):
+            f1 = CharField(max_length=10, widget=TextInput(attrs=extra_attrs))
+            f2 = CharField(widget=TextInput(attrs=extra_attrs))
+
+        self.assertEqual(TestForm(auto_id=False).as_p(), u'<p>F1: <input type="text" class="special" name="f1" maxlength="10" /></p>\n<p>F2: <input type="text" class="special" name="f2" /></p>')
+
+    def test_regression_3600(self):
+        # Tests for form i18n #
+        # There were some problems with form translations in #3600
+
+        class SomeForm(Form):
+            username = CharField(max_length=10, label=ugettext_lazy('Username'))
+
+        f = SomeForm()
+        self.assertEqual(f.as_p(), '<p><label for="id_username">Username:</label> <input id="id_username" type="text" name="username" maxlength="10" /></p>')
+
+        # Translations are done at rendering time, so multi-lingual apps can define forms)
+        activate('de')
+        self.assertEqual(f.as_p(), '<p><label for="id_username">Benutzername:</label> <input id="id_username" type="text" name="username" maxlength="10" /></p>')
+        activate('pl')
+        self.assertEqual(f.as_p(), u'<p><label for="id_username">Nazwa u\u017cytkownika:</label> <input id="id_username" type="text" name="username" maxlength="10" /></p>')
+        deactivate()
+
+    def test_regression_5216(self):
+        # There was some problems with form translations in #5216
+        class SomeForm(Form):
+            field_1 = CharField(max_length=10, label=ugettext_lazy('field_1'))
+            field_2 = CharField(max_length=10, label=ugettext_lazy('field_2'), widget=TextInput(attrs={'id': 'field_2_id'}))
+
+        f = SomeForm()
+        self.assertEqual(f['field_1'].label_tag(), '<label for="id_field_1">field_1</label>')
+        self.assertEqual(f['field_2'].label_tag(), '<label for="field_2_id">field_2</label>')
+
+        # Unicode decoding problems...
+        GENDERS = ((u'\xc5', u'En tied\xe4'), (u'\xf8', u'Mies'), (u'\xdf', u'Nainen'))
+
+        class SomeForm(Form):
+            somechoice = ChoiceField(choices=GENDERS, widget=RadioSelect(), label=u'\xc5\xf8\xdf')
+
+        f = SomeForm()
+        self.assertEqual(f.as_p(), u'<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>')
+
+        # Testing choice validation with UTF-8 bytestrings as input (these are the
+        # Russian abbreviations "мес." and "шт.".
+        UNITS = (('\xd0\xbc\xd0\xb5\xd1\x81.', '\xd0\xbc\xd0\xb5\xd1\x81.'), ('\xd1\x88\xd1\x82.', '\xd1\x88\xd1\x82.'))
+        f = ChoiceField(choices=UNITS)
+        self.assertEqual(f.clean(u'\u0448\u0442.'), u'\u0448\u0442.')
+        self.assertEqual(f.clean('\xd1\x88\xd1\x82.'), u'\u0448\u0442.')
+
+        # Translated error messages used to be buggy.
+        activate('ru')
+        f = SomeForm({})
+        self.assertEqual(f.as_p(), u'<ul class="errorlist"><li>\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043f\u043e\u043b\u0435.</li></ul>\n<p><label for="id_somechoice_0">\xc5\xf8\xdf:</label> <ul>\n<li><label for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"><input type="radio" id="id_somechoice_2" value="\xdf" name="somechoice" /> Nainen</label></li>\n</ul></p>')
+        deactivate()
+
+        # Deep copying translated text shouldn't raise an error)
+        from django.utils.translation import gettext_lazy
+
+        class CopyForm(Form):
+            degree = IntegerField(widget=Select(choices=((1, gettext_lazy('test')),)))
+
+        f = CopyForm()
+
+    def test_misc(self):
+        # There once was a problem with Form fields called "data". Let's make sure that
+        # doesn't come back.
+        class DataForm(Form):
+            data = CharField(max_length=10)
+
+        f = DataForm({'data': 'xyzzy'})
+        self.assertTrue(f.is_valid())
+        self.assertEqual(f.cleaned_data, {'data': u'xyzzy'})
+
+        # A form with *only* hidden fields that has errors is going to be very unusual.
+        class HiddenForm(Form):
+            data = IntegerField(widget=HiddenInput)
+
+        f = HiddenForm({})
+        self.assertEqual(f.as_p(), u'<ul class="errorlist"><li>(Hidden field data) This field is required.</li></ul>\n<p> <input type="hidden" name="data" id="id_data" /></p>')
+        self.assertEqual(f.as_table(), u'<tr><td colspan="2"><ul class="errorlist"><li>(Hidden field data) This field is required.</li></ul><input type="hidden" name="data" id="id_data" /></td></tr>')
+
+    def test_xss_error_messages(self):
+        ###################################################
+        # Tests for XSS vulnerabilities in error messages #
+        ###################################################
+
+        # The forms layer doesn't escape input values directly because error messages
+        # might be presented in non-HTML contexts. Instead, the message is just marked
+        # for escaping by the template engine. So we'll need to construct a little
+        # silly template to trigger the escaping.
+        from django.template import Template, Context
+        t = Template('{{ form.errors }}')
+
+        class SomeForm(Form):
+            field = ChoiceField(choices=[('one', 'One')])
+
+        f = SomeForm({'field': '<script>'})
+        self.assertEqual(t.render(Context({'form': f})), u'<ul class="errorlist"><li>field<ul class="errorlist"><li>Select a valid choice. &lt;script&gt; is not one of the available choices.</li></ul></li></ul>')
+
+        class SomeForm(Form):
+            field = MultipleChoiceField(choices=[('one', 'One')])
+
+        f = SomeForm({'field': ['<script>']})
+        self.assertEqual(t.render(Context({'form': f})), u'<ul class="errorlist"><li>field<ul class="errorlist"><li>Select a valid choice. &lt;script&gt; is not one of the available choices.</li></ul></li></ul>')
+
+        from regressiontests.forms.models import ChoiceModel
+
+        class SomeForm(Form):
+            field = ModelMultipleChoiceField(ChoiceModel.objects.all())
+
+        f = SomeForm({'field': ['<script>']})
+        self.assertEqual(t.render(Context({'form': f})), u'<ul class="errorlist"><li>field<ul class="errorlist"><li>&quot;&lt;script&gt;&quot; is not a valid value for a primary key.</li></ul></li></ul>')
+
+    def test_regression_14234(self):
+        """
+        Re-cleaning an instance that was added via a ModelForm should not raise
+        a pk uniqueness error.
+
+        """
+        class CheeseForm(ModelForm):
+            class Meta:
+                model = Cheese
+
+        form = CheeseForm({
+            'name': 'Brie',
+        })
+
+        self.assertTrue(form.is_valid())
+
+        obj = form.save()
+        obj.name = 'Camembert'
+        obj.full_clean()
diff --git a/parts/django/tests/regressiontests/forms/tests/util.py b/parts/django/tests/regressiontests/forms/tests/util.py
new file mode 100644
index 0000000..8ea3bdd
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/util.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+from unittest import TestCase
+from django.core.exceptions import ValidationError
+from django.forms.util import *
+from django.utils.translation import ugettext_lazy
+
+
+class FormsUtilTestCase(TestCase):
+        # Tests for forms/util.py module.
+
+    def test_flatatt(self):
+        ###########
+        # flatatt #
+        ###########
+
+        self.assertEqual(flatatt({'id': "header"}), u' id="header"')
+        self.assertEqual(flatatt({'class': "news", 'title': "Read this"}), u' class="news" title="Read this"')
+        self.assertEqual(flatatt({}), u'')
+
+    def test_validation_error(self):
+        ###################
+        # ValidationError #
+        ###################
+
+        # Can take a string.
+        self.assertEqual(str(ErrorList(ValidationError("There was an error.").messages)),
+                         '<ul class="errorlist"><li>There was an error.</li></ul>')
+
+        # Can take a unicode string.
+        self.assertEqual(str(ErrorList(ValidationError(u"Not \u03C0.").messages)),
+                         '<ul class="errorlist"><li>Not π.</li></ul>')
+
+        # Can take a lazy string.
+        self.assertEqual(str(ErrorList(ValidationError(ugettext_lazy("Error.")).messages)),
+                         '<ul class="errorlist"><li>Error.</li></ul>')
+
+        # Can take a list.
+        self.assertEqual(str(ErrorList(ValidationError(["Error one.", "Error two."]).messages)),
+                         '<ul class="errorlist"><li>Error one.</li><li>Error two.</li></ul>')
+
+        # Can take a mixture in a list.
+        self.assertEqual(str(ErrorList(ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages)),
+                         '<ul class="errorlist"><li>First error.</li><li>Not π.</li><li>Error.</li></ul>')
+
+        class VeryBadError:
+            def __unicode__(self): return u"A very bad error."
+
+        # Can take a non-string.
+        self.assertEqual(str(ErrorList(ValidationError(VeryBadError()).messages)),
+                         '<ul class="errorlist"><li>A very bad error.</li></ul>')
+
+        # Escapes non-safe input but not input marked safe.
+        example = 'Example of link: <a href="http://www.example.com/">example</a>'
+        self.assertEqual(str(ErrorList([example])),
+                         '<ul class="errorlist"><li>Example of link: &lt;a href=&quot;http://www.example.com/&quot;&gt;example&lt;/a&gt;</li></ul>')
+        self.assertEqual(str(ErrorList([mark_safe(example)])),
+                         '<ul class="errorlist"><li>Example of link: <a href="http://www.example.com/">example</a></li></ul>')
diff --git a/parts/django/tests/regressiontests/forms/tests/validators.py b/parts/django/tests/regressiontests/forms/tests/validators.py
new file mode 100644
index 0000000..ed8e8fb
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/validators.py
@@ -0,0 +1,17 @@
+from unittest import TestCase
+
+from django import forms
+from django.core import validators
+from django.core.exceptions import ValidationError
+
+
+class TestFieldWithValidators(TestCase):
+    def test_all_errors_get_reported(self):
+        field = forms.CharField(
+            validators=[validators.validate_integer, validators.validate_email]
+        )
+        self.assertRaises(ValidationError, field.clean, 'not int nor mail')
+        try:
+            field.clean('not int nor mail')
+        except ValidationError, e:
+            self.assertEqual(2, len(e.messages))
diff --git a/parts/django/tests/regressiontests/forms/tests/widgets.py b/parts/django/tests/regressiontests/forms/tests/widgets.py
new file mode 100644
index 0000000..9e7c6f6
--- /dev/null
+++ b/parts/django/tests/regressiontests/forms/tests/widgets.py
@@ -0,0 +1,1070 @@
+# -*- coding: utf-8 -*-
+import datetime
+from decimal import Decimal
+import re
+import time
+from unittest import TestCase
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.forms import *
+from django.forms.widgets import RadioFieldRenderer
+from django.utils import copycompat as copy
+from django.utils import formats
+from django.utils.safestring import mark_safe
+from django.utils.translation import activate, deactivate
+
+
+
+class FormsWidgetTestCase(TestCase):
+    # Each Widget class corresponds to an HTML form widget. A Widget knows how to
+    # render itself, given a field name and some data. Widgets don't perform
+    # validation.
+    def test_textinput(self):
+        w = TextInput()
+        self.assertEqual(w.render('email', ''), u'<input type="text" name="email" />')
+        self.assertEqual(w.render('email', None), u'<input type="text" name="email" />')
+        self.assertEqual(w.render('email', 'test@example.com'), u'<input type="text" name="email" value="test@example.com" />')
+        self.assertEqual(w.render('email', 'some "quoted" & ampersanded value'), u'<input type="text" name="email" value="some &quot;quoted&quot; &amp; ampersanded value" />')
+        self.assertEqual(w.render('email', 'test@example.com', attrs={'class': 'fun'}), u'<input type="text" name="email" value="test@example.com" class="fun" />')
+
+        # Note that doctest in Python 2.4 (and maybe 2.5?) doesn't support non-ascii
+        # characters in output, so we're displaying the repr() here.
+        self.assertEqual(w.render('email', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}), u'<input type="text" name="email" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" class="fun" />')
+
+        # You can also pass 'attrs' to the constructor:
+        w = TextInput(attrs={'class': 'fun'})
+        self.assertEqual(w.render('email', ''), u'<input type="text" class="fun" name="email" />')
+        self.assertEqual(w.render('email', 'foo@example.com'), u'<input type="text" class="fun" value="foo@example.com" name="email" />')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = TextInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('email', '', attrs={'class': 'special'}), u'<input type="text" class="special" name="email" />')
+
+        # 'attrs' can be safe-strings if needed)
+        w = TextInput(attrs={'onBlur': mark_safe("function('foo')")})
+        self.assertEqual(w.render('email', ''), u'<input onBlur="function(\'foo\')" type="text" name="email" />')
+
+    def test_passwordinput(self):
+        w = PasswordInput()
+        self.assertEqual(w.render('email', ''), u'<input type="password" name="email" />')
+        self.assertEqual(w.render('email', None), u'<input type="password" name="email" />')
+        self.assertEqual(w.render('email', 'test@example.com'), u'<input type="password" name="email" value="test@example.com" />')
+        self.assertEqual(w.render('email', 'some "quoted" & ampersanded value'), u'<input type="password" name="email" value="some &quot;quoted&quot; &amp; ampersanded value" />')
+        self.assertEqual(w.render('email', 'test@example.com', attrs={'class': 'fun'}), u'<input type="password" name="email" value="test@example.com" class="fun" />')
+
+        # You can also pass 'attrs' to the constructor:
+        w = PasswordInput(attrs={'class': 'fun'})
+        self.assertEqual(w.render('email', ''), u'<input type="password" class="fun" name="email" />')
+        self.assertEqual(w.render('email', 'foo@example.com'), u'<input type="password" class="fun" value="foo@example.com" name="email" />')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = PasswordInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('email', '', attrs={'class': 'special'}), u'<input type="password" class="special" name="email" />')
+
+        self.assertEqual(w.render('email', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}), u'<input type="password" class="fun" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" name="email" />')
+
+        # The render_value argument lets you specify whether the widget should render
+        # its value. You may want to do this for security reasons.
+        w = PasswordInput(render_value=True)
+        self.assertEqual(w.render('email', 'secret'), u'<input type="password" name="email" value="secret" />')
+
+        w = PasswordInput(render_value=False)
+        self.assertEqual(w.render('email', ''), u'<input type="password" name="email" />')
+        self.assertEqual(w.render('email', None), u'<input type="password" name="email" />')
+        self.assertEqual(w.render('email', 'secret'), u'<input type="password" name="email" />')
+
+        w = PasswordInput(attrs={'class': 'fun'}, render_value=False)
+        self.assertEqual(w.render('email', 'secret'), u'<input type="password" class="fun" name="email" />')
+
+    def test_hiddeninput(self):
+        w = HiddenInput()
+        self.assertEqual(w.render('email', ''), u'<input type="hidden" name="email" />')
+        self.assertEqual(w.render('email', None), u'<input type="hidden" name="email" />')
+        self.assertEqual(w.render('email', 'test@example.com'), u'<input type="hidden" name="email" value="test@example.com" />')
+        self.assertEqual(w.render('email', 'some "quoted" & ampersanded value'), u'<input type="hidden" name="email" value="some &quot;quoted&quot; &amp; ampersanded value" />')
+        self.assertEqual(w.render('email', 'test@example.com', attrs={'class': 'fun'}), u'<input type="hidden" name="email" value="test@example.com" class="fun" />')
+
+        # You can also pass 'attrs' to the constructor:
+        w = HiddenInput(attrs={'class': 'fun'})
+        self.assertEqual(w.render('email', ''), u'<input type="hidden" class="fun" name="email" />')
+        self.assertEqual(w.render('email', 'foo@example.com'), u'<input type="hidden" class="fun" value="foo@example.com" name="email" />')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = HiddenInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('email', '', attrs={'class': 'special'}), u'<input type="hidden" class="special" name="email" />')
+
+        self.assertEqual(w.render('email', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}), u'<input type="hidden" class="fun" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" name="email" />')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = HiddenInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('email', '', attrs={'class': 'special'}), u'<input type="hidden" class="special" name="email" />')
+
+        # Boolean values are rendered to their string forms ("True" and "False").
+        w = HiddenInput()
+        self.assertEqual(w.render('get_spam', False), u'<input type="hidden" name="get_spam" value="False" />')
+        self.assertEqual(w.render('get_spam', True), u'<input type="hidden" name="get_spam" value="True" />')
+
+    def test_multiplehiddeninput(self):
+        w = MultipleHiddenInput()
+        self.assertEqual(w.render('email', []), u'')
+        self.assertEqual(w.render('email', None), u'')
+        self.assertEqual(w.render('email', ['test@example.com']), u'<input type="hidden" name="email" value="test@example.com" />')
+        self.assertEqual(w.render('email', ['some "quoted" & ampersanded value']), u'<input type="hidden" name="email" value="some &quot;quoted&quot; &amp; ampersanded value" />')
+        self.assertEqual(w.render('email', ['test@example.com', 'foo@example.com']), u'<input type="hidden" name="email" value="test@example.com" />\n<input type="hidden" name="email" value="foo@example.com" />')
+        self.assertEqual(w.render('email', ['test@example.com'], attrs={'class': 'fun'}), u'<input type="hidden" name="email" value="test@example.com" class="fun" />')
+        self.assertEqual(w.render('email', ['test@example.com', 'foo@example.com'], attrs={'class': 'fun'}), u'<input type="hidden" name="email" value="test@example.com" class="fun" />\n<input type="hidden" name="email" value="foo@example.com" class="fun" />')
+
+        # You can also pass 'attrs' to the constructor:
+        w = MultipleHiddenInput(attrs={'class': 'fun'})
+        self.assertEqual(w.render('email', []), u'')
+        self.assertEqual(w.render('email', ['foo@example.com']), u'<input type="hidden" class="fun" value="foo@example.com" name="email" />')
+        self.assertEqual(w.render('email', ['foo@example.com', 'test@example.com']), u'<input type="hidden" class="fun" value="foo@example.com" name="email" />\n<input type="hidden" class="fun" value="test@example.com" name="email" />')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = MultipleHiddenInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('email', ['foo@example.com'], attrs={'class': 'special'}), u'<input type="hidden" class="special" value="foo@example.com" name="email" />')
+
+        self.assertEqual(w.render('email', ['ŠĐĆŽćžšđ'], attrs={'class': 'fun'}), u'<input type="hidden" class="fun" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" name="email" />')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = MultipleHiddenInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('email', ['foo@example.com'], attrs={'class': 'special'}), u'<input type="hidden" class="special" value="foo@example.com" name="email" />')
+
+        # Each input gets a separate ID.
+        w = MultipleHiddenInput()
+        self.assertEqual(w.render('letters', list('abc'), attrs={'id': 'hideme'}), u'<input type="hidden" name="letters" value="a" id="hideme_0" />\n<input type="hidden" name="letters" value="b" id="hideme_1" />\n<input type="hidden" name="letters" value="c" id="hideme_2" />')
+
+    def test_fileinput(self):
+        # FileInput widgets don't ever show the value, because the old value is of no use
+        # if you are updating the form or if the provided file generated an error.
+        w = FileInput()
+        self.assertEqual(w.render('email', ''), u'<input type="file" name="email" />')
+        self.assertEqual(w.render('email', None), u'<input type="file" name="email" />')
+        self.assertEqual(w.render('email', 'test@example.com'), u'<input type="file" name="email" />')
+        self.assertEqual(w.render('email', 'some "quoted" & ampersanded value'), u'<input type="file" name="email" />')
+        self.assertEqual(w.render('email', 'test@example.com', attrs={'class': 'fun'}), u'<input type="file" name="email" class="fun" />')
+
+        # You can also pass 'attrs' to the constructor:
+        w = FileInput(attrs={'class': 'fun'})
+        self.assertEqual(w.render('email', ''), u'<input type="file" class="fun" name="email" />')
+        self.assertEqual(w.render('email', 'foo@example.com'), u'<input type="file" class="fun" name="email" />')
+
+        self.assertEqual(w.render('email', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}), u'<input type="file" class="fun" name="email" />')
+
+        # Test for the behavior of _has_changed for FileInput. The value of data will
+        # more than likely come from request.FILES. The value of initial data will
+        # likely be a filename stored in the database. Since its value is of no use to
+        # a FileInput it is ignored.
+        w = FileInput()
+
+        # No file was uploaded and no initial data.
+        self.assertFalse(w._has_changed(u'', None))
+
+        # A file was uploaded and no initial data.
+        self.assertTrue(w._has_changed(u'', {'filename': 'resume.txt', 'content': 'My resume'}))
+
+        # A file was not uploaded, but there is initial data
+        self.assertFalse(w._has_changed(u'resume.txt', None))
+
+        # A file was uploaded and there is initial data (file identity is not dealt
+        # with here)
+        self.assertTrue(w._has_changed('resume.txt', {'filename': 'resume.txt', 'content': 'My resume'}))
+
+    def test_textarea(self):
+        w = Textarea()
+        self.assertEqual(w.render('msg', ''), u'<textarea rows="10" cols="40" name="msg"></textarea>')
+        self.assertEqual(w.render('msg', None), u'<textarea rows="10" cols="40" name="msg"></textarea>')
+        self.assertEqual(w.render('msg', 'value'), u'<textarea rows="10" cols="40" name="msg">value</textarea>')
+        self.assertEqual(w.render('msg', 'some "quoted" & ampersanded value'), u'<textarea rows="10" cols="40" name="msg">some &quot;quoted&quot; &amp; ampersanded value</textarea>')
+        self.assertEqual(w.render('msg', mark_safe('pre &quot;quoted&quot; value')), u'<textarea rows="10" cols="40" name="msg">pre &quot;quoted&quot; value</textarea>')
+        self.assertEqual(w.render('msg', 'value', attrs={'class': 'pretty', 'rows': 20}), u'<textarea class="pretty" rows="20" cols="40" name="msg">value</textarea>')
+
+        # You can also pass 'attrs' to the constructor:
+        w = Textarea(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('msg', ''), u'<textarea rows="10" cols="40" name="msg" class="pretty"></textarea>')
+        self.assertEqual(w.render('msg', 'example'), u'<textarea rows="10" cols="40" name="msg" class="pretty">example</textarea>')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = Textarea(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('msg', '', attrs={'class': 'special'}), u'<textarea rows="10" cols="40" name="msg" class="special"></textarea>')
+
+        self.assertEqual(w.render('msg', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'}), u'<textarea rows="10" cols="40" name="msg" class="fun">\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111</textarea>')
+
+    def test_checkboxinput(self):
+        w = CheckboxInput()
+        self.assertEqual(w.render('is_cool', ''), u'<input type="checkbox" name="is_cool" />')
+        self.assertEqual(w.render('is_cool', None), u'<input type="checkbox" name="is_cool" />')
+        self.assertEqual(w.render('is_cool', False), u'<input type="checkbox" name="is_cool" />')
+        self.assertEqual(w.render('is_cool', True), u'<input checked="checked" type="checkbox" name="is_cool" />')
+
+        # Using any value that's not in ('', None, False, True) will check the checkbox
+        # and set the 'value' attribute.
+        self.assertEqual(w.render('is_cool', 'foo'), u'<input checked="checked" type="checkbox" name="is_cool" value="foo" />')
+
+        self.assertEqual(w.render('is_cool', False, attrs={'class': 'pretty'}), u'<input type="checkbox" name="is_cool" class="pretty" />')
+
+        # You can also pass 'attrs' to the constructor:
+        w = CheckboxInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('is_cool', ''), u'<input type="checkbox" class="pretty" name="is_cool" />')
+
+        # 'attrs' passed to render() get precedence over those passed to the constructor:
+        w = CheckboxInput(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('is_cool', '', attrs={'class': 'special'}), u'<input type="checkbox" class="special" name="is_cool" />')
+
+        # You can pass 'check_test' to the constructor. This is a callable that takes the
+        # value and returns True if the box should be checked.
+        w = CheckboxInput(check_test=lambda value: value.startswith('hello'))
+        self.assertEqual(w.render('greeting', ''), u'<input type="checkbox" name="greeting" />')
+        self.assertEqual(w.render('greeting', 'hello'), u'<input checked="checked" type="checkbox" name="greeting" value="hello" />')
+        self.assertEqual(w.render('greeting', 'hello there'), u'<input checked="checked" type="checkbox" name="greeting" value="hello there" />')
+        self.assertEqual(w.render('greeting', 'hello & goodbye'), u'<input checked="checked" type="checkbox" name="greeting" value="hello &amp; goodbye" />')
+
+        # A subtlety: If the 'check_test' argument cannot handle a value and raises any
+        # exception during its __call__, then the exception will be swallowed and the box
+        # will not be checked. In this example, the 'check_test' assumes the value has a
+        # startswith() method, which fails for the values True, False and None.
+        self.assertEqual(w.render('greeting', True), u'<input type="checkbox" name="greeting" />')
+        self.assertEqual(w.render('greeting', False), u'<input type="checkbox" name="greeting" />')
+        self.assertEqual(w.render('greeting', None), u'<input type="checkbox" name="greeting" />')
+
+        # The CheckboxInput widget will return False if the key is not found in the data
+        # dictionary (because HTML form submission doesn't send any result for unchecked
+        # checkboxes).
+        self.assertFalse(w.value_from_datadict({}, {}, 'testing'))
+
+        self.assertFalse(w._has_changed(None, None))
+        self.assertFalse(w._has_changed(None, u''))
+        self.assertFalse(w._has_changed(u'', None))
+        self.assertFalse(w._has_changed(u'', u''))
+        self.assertTrue(w._has_changed(False, u'on'))
+        self.assertFalse(w._has_changed(True, u'on'))
+        self.assertTrue(w._has_changed(True, u''))
+
+    def test_select(self):
+        w = Select()
+        self.assertEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select name="beatle">
+<option value="J" selected="selected">John</option>
+<option value="P">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>""")
+
+        # If the value is None, none of the options are selected:
+        self.assertEqual(w.render('beatle', None, choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select name="beatle">
+<option value="J">John</option>
+<option value="P">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>""")
+
+        # If the value corresponds to a label (but not to an option value), none of the options are selected:
+        self.assertEqual(w.render('beatle', 'John', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select name="beatle">
+<option value="J">John</option>
+<option value="P">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>""")
+
+        # The value is compared to its str():
+        self.assertEqual(w.render('num', 2, choices=[('1', '1'), ('2', '2'), ('3', '3')]), """<select name="num">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+        self.assertEqual(w.render('num', '2', choices=[(1, 1), (2, 2), (3, 3)]), """<select name="num">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+        self.assertEqual(w.render('num', 2, choices=[(1, 1), (2, 2), (3, 3)]), """<select name="num">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+
+        # The 'choices' argument can be any iterable:
+        from itertools import chain
+        def get_choices():
+            for i in range(5):
+                yield (i, i)
+        self.assertEqual(w.render('num', 2, choices=get_choices()), """<select name="num">
+<option value="0">0</option>
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+</select>""")
+        things = ({'id': 1, 'name': 'And Boom'}, {'id': 2, 'name': 'One More Thing!'})
+        class SomeForm(Form):
+            somechoice = ChoiceField(choices=chain((('', '-'*9),), [(thing['id'], thing['name']) for thing in things]))
+        f = SomeForm()
+        self.assertEqual(f.as_table(), u'<tr><th><label for="id_somechoice">Somechoice:</label></th><td><select name="somechoice" id="id_somechoice">\n<option value="" selected="selected">---------</option>\n<option value="1">And Boom</option>\n<option value="2">One More Thing!</option>\n</select></td></tr>')
+        self.assertEqual(f.as_table(), u'<tr><th><label for="id_somechoice">Somechoice:</label></th><td><select name="somechoice" id="id_somechoice">\n<option value="" selected="selected">---------</option>\n<option value="1">And Boom</option>\n<option value="2">One More Thing!</option>\n</select></td></tr>')
+        f = SomeForm({'somechoice': 2})
+        self.assertEqual(f.as_table(), u'<tr><th><label for="id_somechoice">Somechoice:</label></th><td><select name="somechoice" id="id_somechoice">\n<option value="">---------</option>\n<option value="1">And Boom</option>\n<option value="2" selected="selected">One More Thing!</option>\n</select></td></tr>')
+
+        # You can also pass 'choices' to the constructor:
+        w = Select(choices=[(1, 1), (2, 2), (3, 3)])
+        self.assertEqual(w.render('num', 2), """<select name="num">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+
+        # If 'choices' is passed to both the constructor and render(), then they'll both be in the output:
+        self.assertEqual(w.render('num', 2, choices=[(4, 4), (5, 5)]), """<select name="num">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+</select>""")
+
+        # Choices are escaped correctly
+        self.assertEqual(w.render('escape', None, choices=(('bad', 'you & me'), ('good', mark_safe('you &gt; me')))), """<select name="escape">
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="bad">you &amp; me</option>
+<option value="good">you &gt; me</option>
+</select>""")
+
+        # Unicode choices are correctly rendered as HTML
+        self.assertEqual(w.render('email', 'ŠĐĆŽćžšđ', choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]), u'<select name="email">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" selected="selected">\u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</option>\n<option value="\u0107\u017e\u0161\u0111">abc\u0107\u017e\u0161\u0111</option>\n</select>')
+
+        # If choices is passed to the constructor and is a generator, it can be iterated
+        # over multiple times without getting consumed:
+        w = Select(choices=get_choices())
+        self.assertEqual(w.render('num', 2), """<select name="num">
+<option value="0">0</option>
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+</select>""")
+        self.assertEqual(w.render('num', 3), """<select name="num">
+<option value="0">0</option>
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3" selected="selected">3</option>
+<option value="4">4</option>
+</select>""")
+
+        # Choices can be nested one level in order to create HTML optgroups:
+        w.choices=(('outer1', 'Outer 1'), ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2'))))
+        self.assertEqual(w.render('nestchoice', None), """<select name="nestchoice">
+<option value="outer1">Outer 1</option>
+<optgroup label="Group &quot;1&quot;">
+<option value="inner1">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>""")
+
+        self.assertEqual(w.render('nestchoice', 'outer1'), """<select name="nestchoice">
+<option value="outer1" selected="selected">Outer 1</option>
+<optgroup label="Group &quot;1&quot;">
+<option value="inner1">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>""")
+
+        self.assertEqual(w.render('nestchoice', 'inner1'), """<select name="nestchoice">
+<option value="outer1">Outer 1</option>
+<optgroup label="Group &quot;1&quot;">
+<option value="inner1" selected="selected">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>""")
+
+    def test_nullbooleanselect(self):
+        w = NullBooleanSelect()
+        self.assertTrue(w.render('is_cool', True), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2" selected="selected">Yes</option>
+<option value="3">No</option>
+</select>""")
+        self.assertEqual(w.render('is_cool', False), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2">Yes</option>
+<option value="3" selected="selected">No</option>
+</select>""")
+        self.assertEqual(w.render('is_cool', None), """<select name="is_cool">
+<option value="1" selected="selected">Unknown</option>
+<option value="2">Yes</option>
+<option value="3">No</option>
+</select>""")
+        self.assertEqual(w.render('is_cool', '2'), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2" selected="selected">Yes</option>
+<option value="3">No</option>
+</select>""")
+        self.assertEqual(w.render('is_cool', '3'), """<select name="is_cool">
+<option value="1">Unknown</option>
+<option value="2">Yes</option>
+<option value="3" selected="selected">No</option>
+</select>""")
+        self.assertTrue(w._has_changed(False, None))
+        self.assertTrue(w._has_changed(None, False))
+        self.assertFalse(w._has_changed(None, None))
+        self.assertFalse(w._has_changed(False, False))
+        self.assertTrue(w._has_changed(True, False))
+        self.assertTrue(w._has_changed(True, None))
+        self.assertTrue(w._has_changed(True, False))
+
+    def test_selectmultiple(self):
+        w = SelectMultiple()
+        self.assertEqual(w.render('beatles', ['J'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select multiple="multiple" name="beatles">
+<option value="J" selected="selected">John</option>
+<option value="P">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>""")
+        self.assertEqual(w.render('beatles', ['J', 'P'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select multiple="multiple" name="beatles">
+<option value="J" selected="selected">John</option>
+<option value="P" selected="selected">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>""")
+        self.assertEqual(w.render('beatles', ['J', 'P', 'R'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select multiple="multiple" name="beatles">
+<option value="J" selected="selected">John</option>
+<option value="P" selected="selected">Paul</option>
+<option value="G">George</option>
+<option value="R" selected="selected">Ringo</option>
+</select>""")
+
+        # If the value is None, none of the options are selected:
+        self.assertEqual(w.render('beatles', None, choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select multiple="multiple" name="beatles">
+<option value="J">John</option>
+<option value="P">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>""")
+
+        # If the value corresponds to a label (but not to an option value), none of the options are selected:
+        self.assertEqual(w.render('beatles', ['John'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select multiple="multiple" name="beatles">
+<option value="J">John</option>
+<option value="P">Paul</option>
+<option value="G">George</option>
+<option value="R">Ringo</option>
+</select>""")
+
+        # If multiple values are given, but some of them are not valid, the valid ones are selected:
+        self.assertEqual(w.render('beatles', ['J', 'G', 'foo'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<select multiple="multiple" name="beatles">
+<option value="J" selected="selected">John</option>
+<option value="P">Paul</option>
+<option value="G" selected="selected">George</option>
+<option value="R">Ringo</option>
+</select>""")
+
+        # The value is compared to its str():
+        self.assertEqual(w.render('nums', [2], choices=[('1', '1'), ('2', '2'), ('3', '3')]), """<select multiple="multiple" name="nums">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+        self.assertEqual(w.render('nums', ['2'], choices=[(1, 1), (2, 2), (3, 3)]), """<select multiple="multiple" name="nums">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+        self.assertEqual(w.render('nums', [2], choices=[(1, 1), (2, 2), (3, 3)]), """<select multiple="multiple" name="nums">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+
+        # The 'choices' argument can be any iterable:
+        def get_choices():
+            for i in range(5):
+                yield (i, i)
+        self.assertEqual(w.render('nums', [2], choices=get_choices()), """<select multiple="multiple" name="nums">
+<option value="0">0</option>
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+</select>""")
+
+        # You can also pass 'choices' to the constructor:
+        w = SelectMultiple(choices=[(1, 1), (2, 2), (3, 3)])
+        self.assertEqual(w.render('nums', [2]), """<select multiple="multiple" name="nums">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+</select>""")
+
+        # If 'choices' is passed to both the constructor and render(), then they'll both be in the output:
+        self.assertEqual(w.render('nums', [2], choices=[(4, 4), (5, 5)]), """<select multiple="multiple" name="nums">
+<option value="1">1</option>
+<option value="2" selected="selected">2</option>
+<option value="3">3</option>
+<option value="4">4</option>
+<option value="5">5</option>
+</select>""")
+
+        # Choices are escaped correctly
+        self.assertEqual(w.render('escape', None, choices=(('bad', 'you & me'), ('good', mark_safe('you &gt; me')))), """<select multiple="multiple" name="escape">
+<option value="1">1</option>
+<option value="2">2</option>
+<option value="3">3</option>
+<option value="bad">you &amp; me</option>
+<option value="good">you &gt; me</option>
+</select>""")
+
+        # Unicode choices are correctly rendered as HTML
+        self.assertEqual(w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]), u'<select multiple="multiple" name="nums">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" selected="selected">\u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</option>\n<option value="\u0107\u017e\u0161\u0111">abc\u0107\u017e\u0161\u0111</option>\n</select>')
+
+        # Test the usage of _has_changed
+        self.assertFalse(w._has_changed(None, None))
+        self.assertFalse(w._has_changed([], None))
+        self.assertTrue(w._has_changed(None, [u'1']))
+        self.assertFalse(w._has_changed([1, 2], [u'1', u'2']))
+        self.assertTrue(w._has_changed([1, 2], [u'1']))
+        self.assertTrue(w._has_changed([1, 2], [u'1', u'3']))
+
+        # Choices can be nested one level in order to create HTML optgroups:
+        w.choices = (('outer1', 'Outer 1'), ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2'))))
+        self.assertEqual(w.render('nestchoice', None), """<select multiple="multiple" name="nestchoice">
+<option value="outer1">Outer 1</option>
+<optgroup label="Group &quot;1&quot;">
+<option value="inner1">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>""")
+
+        self.assertEqual(w.render('nestchoice', ['outer1']), """<select multiple="multiple" name="nestchoice">
+<option value="outer1" selected="selected">Outer 1</option>
+<optgroup label="Group &quot;1&quot;">
+<option value="inner1">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>""")
+
+        self.assertEqual(w.render('nestchoice', ['inner1']), """<select multiple="multiple" name="nestchoice">
+<option value="outer1">Outer 1</option>
+<optgroup label="Group &quot;1&quot;">
+<option value="inner1" selected="selected">Inner 1</option>
+<option value="inner2">Inner 2</option>
+</optgroup>
+</select>""")
+
+        self.assertEqual(w.render('nestchoice', ['outer1', 'inner2']), """<select multiple="multiple" name="nestchoice">
+<option value="outer1" selected="selected">Outer 1</option>
+<optgroup label="Group &quot;1&quot;">
+<option value="inner1">Inner 1</option>
+<option value="inner2" selected="selected">Inner 2</option>
+</optgroup>
+</select>""")
+
+    def test_radioselect(self):
+        w = RadioSelect()
+        self.assertEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input checked="checked" type="radio" name="beatle" value="J" /> John</label></li>
+<li><label><input type="radio" name="beatle" value="P" /> Paul</label></li>
+<li><label><input type="radio" name="beatle" value="G" /> George</label></li>
+<li><label><input type="radio" name="beatle" value="R" /> Ringo</label></li>
+</ul>""")
+
+        # If the value is None, none of the options are checked:
+        self.assertEqual(w.render('beatle', None, choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input type="radio" name="beatle" value="J" /> John</label></li>
+<li><label><input type="radio" name="beatle" value="P" /> Paul</label></li>
+<li><label><input type="radio" name="beatle" value="G" /> George</label></li>
+<li><label><input type="radio" name="beatle" value="R" /> Ringo</label></li>
+</ul>""")
+
+        # If the value corresponds to a label (but not to an option value), none of the options are checked:
+        self.assertEqual(w.render('beatle', 'John', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input type="radio" name="beatle" value="J" /> John</label></li>
+<li><label><input type="radio" name="beatle" value="P" /> Paul</label></li>
+<li><label><input type="radio" name="beatle" value="G" /> George</label></li>
+<li><label><input type="radio" name="beatle" value="R" /> Ringo</label></li>
+</ul>""")
+
+        # The value is compared to its str():
+        self.assertEqual(w.render('num', 2, choices=[('1', '1'), ('2', '2'), ('3', '3')]), """<ul>
+<li><label><input type="radio" name="num" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="radio" name="num" value="2" /> 2</label></li>
+<li><label><input type="radio" name="num" value="3" /> 3</label></li>
+</ul>""")
+        self.assertEqual(w.render('num', '2', choices=[(1, 1), (2, 2), (3, 3)]), """<ul>
+<li><label><input type="radio" name="num" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="radio" name="num" value="2" /> 2</label></li>
+<li><label><input type="radio" name="num" value="3" /> 3</label></li>
+</ul>""")
+        self.assertEqual(w.render('num', 2, choices=[(1, 1), (2, 2), (3, 3)]), """<ul>
+<li><label><input type="radio" name="num" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="radio" name="num" value="2" /> 2</label></li>
+<li><label><input type="radio" name="num" value="3" /> 3</label></li>
+</ul>""")
+
+        # The 'choices' argument can be any iterable:
+        def get_choices():
+            for i in range(5):
+                yield (i, i)
+        self.assertEqual(w.render('num', 2, choices=get_choices()), """<ul>
+<li><label><input type="radio" name="num" value="0" /> 0</label></li>
+<li><label><input type="radio" name="num" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="radio" name="num" value="2" /> 2</label></li>
+<li><label><input type="radio" name="num" value="3" /> 3</label></li>
+<li><label><input type="radio" name="num" value="4" /> 4</label></li>
+</ul>""")
+
+        # You can also pass 'choices' to the constructor:
+        w = RadioSelect(choices=[(1, 1), (2, 2), (3, 3)])
+        self.assertEqual(w.render('num', 2), """<ul>
+<li><label><input type="radio" name="num" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="radio" name="num" value="2" /> 2</label></li>
+<li><label><input type="radio" name="num" value="3" /> 3</label></li>
+</ul>""")
+
+        # If 'choices' is passed to both the constructor and render(), then they'll both be in the output:
+        self.assertEqual(w.render('num', 2, choices=[(4, 4), (5, 5)]), """<ul>
+<li><label><input type="radio" name="num" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="radio" name="num" value="2" /> 2</label></li>
+<li><label><input type="radio" name="num" value="3" /> 3</label></li>
+<li><label><input type="radio" name="num" value="4" /> 4</label></li>
+<li><label><input type="radio" name="num" value="5" /> 5</label></li>
+</ul>""")
+
+        # RadioSelect uses a RadioFieldRenderer to render the individual radio inputs.
+        # You can manipulate that object directly to customize the way the RadioSelect
+        # is rendered.
+        w = RadioSelect()
+        r = w.get_renderer('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
+        inp_set1 = []
+        inp_set2 = []
+        inp_set3 = []
+        inp_set4 = []
+
+        for inp in r:
+            inp_set1.append(str(inp))
+            inp_set2.append('%s<br />' % inp)
+            inp_set3.append('<p>%s %s</p>' % (inp.tag(), inp.choice_label))
+            inp_set4.append('%s %s %s %s %s' % (inp.name, inp.value, inp.choice_value, inp.choice_label, inp.is_checked()))
+
+        self.assertEqual('\n'.join(inp_set1), """<label><input checked="checked" type="radio" name="beatle" value="J" /> John</label>
+<label><input type="radio" name="beatle" value="P" /> Paul</label>
+<label><input type="radio" name="beatle" value="G" /> George</label>
+<label><input type="radio" name="beatle" value="R" /> Ringo</label>""")
+        self.assertEqual('\n'.join(inp_set2), """<label><input checked="checked" type="radio" name="beatle" value="J" /> John</label><br />
+<label><input type="radio" name="beatle" value="P" /> Paul</label><br />
+<label><input type="radio" name="beatle" value="G" /> George</label><br />
+<label><input type="radio" name="beatle" value="R" /> Ringo</label><br />""")
+        self.assertEqual('\n'.join(inp_set3), """<p><input checked="checked" type="radio" name="beatle" value="J" /> John</p>
+<p><input type="radio" name="beatle" value="P" /> Paul</p>
+<p><input type="radio" name="beatle" value="G" /> George</p>
+<p><input type="radio" name="beatle" value="R" /> Ringo</p>""")
+        self.assertEqual('\n'.join(inp_set4), """beatle J J John True
+beatle J P Paul False
+beatle J G George False
+beatle J R Ringo False""")
+
+        # You can create your own custom renderers for RadioSelect to use.
+        class MyRenderer(RadioFieldRenderer):
+           def render(self):
+               return u'<br />\n'.join([unicode(choice) for choice in self])
+        w = RadioSelect(renderer=MyRenderer)
+        self.assertEqual(w.render('beatle', 'G', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<label><input type="radio" name="beatle" value="J" /> John</label><br />
+<label><input type="radio" name="beatle" value="P" /> Paul</label><br />
+<label><input checked="checked" type="radio" name="beatle" value="G" /> George</label><br />
+<label><input type="radio" name="beatle" value="R" /> Ringo</label>""")
+
+        # Or you can use custom RadioSelect fields that use your custom renderer.
+        class CustomRadioSelect(RadioSelect):
+           renderer = MyRenderer
+        w = CustomRadioSelect()
+        self.assertEqual(w.render('beatle', 'G', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<label><input type="radio" name="beatle" value="J" /> John</label><br />
+<label><input type="radio" name="beatle" value="P" /> Paul</label><br />
+<label><input checked="checked" type="radio" name="beatle" value="G" /> George</label><br />
+<label><input type="radio" name="beatle" value="R" /> Ringo</label>""")
+
+        # A RadioFieldRenderer object also allows index access to individual RadioInput
+        w = RadioSelect()
+        r = w.get_renderer('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
+        self.assertEqual(str(r[1]), '<label><input type="radio" name="beatle" value="P" /> Paul</label>')
+        self.assertEqual(str(r[0]), '<label><input checked="checked" type="radio" name="beatle" value="J" /> John</label>')
+        self.assertTrue(r[0].is_checked())
+        self.assertFalse(r[1].is_checked())
+        self.assertEqual((r[1].name, r[1].value, r[1].choice_value, r[1].choice_label), ('beatle', u'J', u'P', u'Paul'))
+
+        try:
+            r[10]
+            self.fail("This offset should not exist.")
+        except IndexError:
+            pass
+
+        # Choices are escaped correctly
+        w = RadioSelect()
+        self.assertEqual(w.render('escape', None, choices=(('bad', 'you & me'), ('good', mark_safe('you &gt; me')))), """<ul>
+<li><label><input type="radio" name="escape" value="bad" /> you &amp; me</label></li>
+<li><label><input type="radio" name="escape" value="good" /> you &gt; me</label></li>
+</ul>""")
+
+        # Unicode choices are correctly rendered as HTML
+        w = RadioSelect()
+        self.assertEqual(unicode(w.render('email', 'ŠĐĆŽćžšđ', choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')])), u'<ul>\n<li><label><input checked="checked" type="radio" name="email" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /> \u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</label></li>\n<li><label><input type="radio" name="email" value="\u0107\u017e\u0161\u0111" /> abc\u0107\u017e\u0161\u0111</label></li>\n</ul>')
+
+        # Attributes provided at instantiation are passed to the constituent inputs
+        w = RadioSelect(attrs={'id':'foo'})
+        self.assertEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label for="foo_0"><input checked="checked" type="radio" id="foo_0" value="J" name="beatle" /> John</label></li>
+<li><label for="foo_1"><input type="radio" id="foo_1" value="P" name="beatle" /> Paul</label></li>
+<li><label for="foo_2"><input type="radio" id="foo_2" value="G" name="beatle" /> George</label></li>
+<li><label for="foo_3"><input type="radio" id="foo_3" value="R" name="beatle" /> Ringo</label></li>
+</ul>""")
+
+        # Attributes provided at render-time are passed to the constituent inputs
+        w = RadioSelect()
+        self.assertEqual(w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'}), """<ul>
+<li><label for="bar_0"><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label></li>
+<li><label for="bar_1"><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></li>
+<li><label for="bar_2"><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></li>
+<li><label for="bar_3"><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label></li>
+</ul>""")
+
+    def test_checkboxselectmultiple(self):
+        w = CheckboxSelectMultiple()
+        self.assertEqual(w.render('beatles', ['J'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
+<li><label><input type="checkbox" name="beatles" value="P" /> Paul</label></li>
+<li><label><input type="checkbox" name="beatles" value="G" /> George</label></li>
+<li><label><input type="checkbox" name="beatles" value="R" /> Ringo</label></li>
+</ul>""")
+        self.assertEqual(w.render('beatles', ['J', 'P'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="P" /> Paul</label></li>
+<li><label><input type="checkbox" name="beatles" value="G" /> George</label></li>
+<li><label><input type="checkbox" name="beatles" value="R" /> Ringo</label></li>
+</ul>""")
+        self.assertEqual(w.render('beatles', ['J', 'P', 'R'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="P" /> Paul</label></li>
+<li><label><input type="checkbox" name="beatles" value="G" /> George</label></li>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="R" /> Ringo</label></li>
+</ul>""")
+
+        # If the value is None, none of the options are selected:
+        self.assertEqual(w.render('beatles', None, choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input type="checkbox" name="beatles" value="J" /> John</label></li>
+<li><label><input type="checkbox" name="beatles" value="P" /> Paul</label></li>
+<li><label><input type="checkbox" name="beatles" value="G" /> George</label></li>
+<li><label><input type="checkbox" name="beatles" value="R" /> Ringo</label></li>
+</ul>""")
+
+        # If the value corresponds to a label (but not to an option value), none of the options are selected:
+        self.assertEqual(w.render('beatles', ['John'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input type="checkbox" name="beatles" value="J" /> John</label></li>
+<li><label><input type="checkbox" name="beatles" value="P" /> Paul</label></li>
+<li><label><input type="checkbox" name="beatles" value="G" /> George</label></li>
+<li><label><input type="checkbox" name="beatles" value="R" /> Ringo</label></li>
+</ul>""")
+
+        # If multiple values are given, but some of them are not valid, the valid ones are selected:
+        self.assertEqual(w.render('beatles', ['J', 'G', 'foo'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))), """<ul>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="J" /> John</label></li>
+<li><label><input type="checkbox" name="beatles" value="P" /> Paul</label></li>
+<li><label><input checked="checked" type="checkbox" name="beatles" value="G" /> George</label></li>
+<li><label><input type="checkbox" name="beatles" value="R" /> Ringo</label></li>
+</ul>""")
+
+        # The value is compared to its str():
+        self.assertEqual(w.render('nums', [2], choices=[('1', '1'), ('2', '2'), ('3', '3')]), """<ul>
+<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="checkbox" name="nums" value="2" /> 2</label></li>
+<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>
+</ul>""")
+        self.assertEqual(w.render('nums', ['2'], choices=[(1, 1), (2, 2), (3, 3)]), """<ul>
+<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="checkbox" name="nums" value="2" /> 2</label></li>
+<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>
+</ul>""")
+        self.assertEqual(w.render('nums', [2], choices=[(1, 1), (2, 2), (3, 3)]), """<ul>
+<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="checkbox" name="nums" value="2" /> 2</label></li>
+<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>
+</ul>""")
+
+        # The 'choices' argument can be any iterable:
+        def get_choices():
+            for i in range(5):
+                yield (i, i)
+        self.assertEqual(w.render('nums', [2], choices=get_choices()), """<ul>
+<li><label><input type="checkbox" name="nums" value="0" /> 0</label></li>
+<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="checkbox" name="nums" value="2" /> 2</label></li>
+<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>
+<li><label><input type="checkbox" name="nums" value="4" /> 4</label></li>
+</ul>""")
+
+        # You can also pass 'choices' to the constructor:
+        w = CheckboxSelectMultiple(choices=[(1, 1), (2, 2), (3, 3)])
+        self.assertEqual(w.render('nums', [2]), """<ul>
+<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="checkbox" name="nums" value="2" /> 2</label></li>
+<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>
+</ul>""")
+
+        # If 'choices' is passed to both the constructor and render(), then they'll both be in the output:
+        self.assertEqual(w.render('nums', [2], choices=[(4, 4), (5, 5)]), """<ul>
+<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>
+<li><label><input checked="checked" type="checkbox" name="nums" value="2" /> 2</label></li>
+<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>
+<li><label><input type="checkbox" name="nums" value="4" /> 4</label></li>
+<li><label><input type="checkbox" name="nums" value="5" /> 5</label></li>
+</ul>""")
+
+        # Choices are escaped correctly
+        self.assertEqual(w.render('escape', None, choices=(('bad', 'you & me'), ('good', mark_safe('you &gt; me')))), """<ul>
+<li><label><input type="checkbox" name="escape" value="1" /> 1</label></li>
+<li><label><input type="checkbox" name="escape" value="2" /> 2</label></li>
+<li><label><input type="checkbox" name="escape" value="3" /> 3</label></li>
+<li><label><input type="checkbox" name="escape" value="bad" /> you &amp; me</label></li>
+<li><label><input type="checkbox" name="escape" value="good" /> you &gt; me</label></li>
+</ul>""")
+
+        # Test the usage of _has_changed
+        self.assertFalse(w._has_changed(None, None))
+        self.assertFalse(w._has_changed([], None))
+        self.assertTrue(w._has_changed(None, [u'1']))
+        self.assertFalse(w._has_changed([1, 2], [u'1', u'2']))
+        self.assertTrue(w._has_changed([1, 2], [u'1']))
+        self.assertTrue(w._has_changed([1, 2], [u'1', u'3']))
+        self.assertFalse(w._has_changed([2, 1], [u'1', u'2']))
+
+        # Unicode choices are correctly rendered as HTML
+        self.assertEqual(w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]), u'<ul>\n<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>\n<li><label><input type="checkbox" name="nums" value="2" /> 2</label></li>\n<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>\n<li><label><input checked="checked" type="checkbox" name="nums" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /> \u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</label></li>\n<li><label><input type="checkbox" name="nums" value="\u0107\u017e\u0161\u0111" /> abc\u0107\u017e\u0161\u0111</label></li>\n</ul>')
+
+        # Each input gets a separate ID
+        self.assertEqual(CheckboxSelectMultiple().render('letters', list('ac'), choices=zip(list('abc'), list('ABC')), attrs={'id': 'abc'}), """<ul>
+<li><label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label></li>
+<li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>
+<li><label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label></li>
+</ul>""")
+
+    def test_multi(self):
+        class MyMultiWidget(MultiWidget):
+            def decompress(self, value):
+                if value:
+                    return value.split('__')
+                return ['', '']
+            def format_output(self, rendered_widgets):
+                return u'<br />'.join(rendered_widgets)
+
+        w = MyMultiWidget(widgets=(TextInput(attrs={'class': 'big'}), TextInput(attrs={'class': 'small'})))
+        self.assertEqual(w.render('name', ['john', 'lennon']), u'<input type="text" class="big" value="john" name="name_0" /><br /><input type="text" class="small" value="lennon" name="name_1" />')
+        self.assertEqual(w.render('name', 'john__lennon'), u'<input type="text" class="big" value="john" name="name_0" /><br /><input type="text" class="small" value="lennon" name="name_1" />')
+        self.assertEqual(w.render('name', 'john__lennon', attrs={'id':'foo'}), u'<input id="foo_0" type="text" class="big" value="john" name="name_0" /><br /><input id="foo_1" type="text" class="small" value="lennon" name="name_1" />')
+        w = MyMultiWidget(widgets=(TextInput(attrs={'class': 'big'}), TextInput(attrs={'class': 'small'})), attrs={'id': 'bar'})
+        self.assertEqual(w.render('name', ['john', 'lennon']), u'<input id="bar_0" type="text" class="big" value="john" name="name_0" /><br /><input id="bar_1" type="text" class="small" value="lennon" name="name_1" />')
+
+        w = MyMultiWidget(widgets=(TextInput(), TextInput()))
+
+        # test with no initial data
+        self.assertTrue(w._has_changed(None, [u'john', u'lennon']))
+
+        # test when the data is the same as initial
+        self.assertFalse(w._has_changed(u'john__lennon', [u'john', u'lennon']))
+
+        # test when the first widget's data has changed
+        self.assertTrue(w._has_changed(u'john__lennon', [u'alfred', u'lennon']))
+
+        # test when the last widget's data has changed. this ensures that it is not
+        # short circuiting while testing the widgets.
+        self.assertTrue(w._has_changed(u'john__lennon', [u'john', u'denver']))
+
+    def test_splitdatetime(self):
+        w = SplitDateTimeWidget()
+        self.assertEqual(w.render('date', ''), u'<input type="text" name="date_0" /><input type="text" name="date_1" />')
+        self.assertEqual(w.render('date', None), u'<input type="text" name="date_0" /><input type="text" name="date_1" />')
+        self.assertEqual(w.render('date', datetime.datetime(2006, 1, 10, 7, 30)), u'<input type="text" name="date_0" value="2006-01-10" /><input type="text" name="date_1" value="07:30:00" />')
+        self.assertEqual(w.render('date', [datetime.date(2006, 1, 10), datetime.time(7, 30)]), u'<input type="text" name="date_0" value="2006-01-10" /><input type="text" name="date_1" value="07:30:00" />')
+
+        # You can also pass 'attrs' to the constructor. In this case, the attrs will be
+        w = SplitDateTimeWidget(attrs={'class': 'pretty'})
+        self.assertEqual(w.render('date', datetime.datetime(2006, 1, 10, 7, 30)), u'<input type="text" class="pretty" value="2006-01-10" name="date_0" /><input type="text" class="pretty" value="07:30:00" name="date_1" />')
+
+        # Use 'date_format' and 'time_format' to change the way a value is displayed.
+        w = SplitDateTimeWidget(date_format='%d/%m/%Y', time_format='%H:%M')
+        self.assertEqual(w.render('date', datetime.datetime(2006, 1, 10, 7, 30)), u'<input type="text" name="date_0" value="10/01/2006" /><input type="text" name="date_1" value="07:30" />')
+
+        self.assertTrue(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'2008-05-06', u'12:40:00']))
+        self.assertFalse(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'06/05/2008', u'12:40']))
+        self.assertTrue(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'06/05/2008', u'12:41']))
+
+    def test_datetimeinput(self):
+        w = DateTimeInput()
+        self.assertEqual(w.render('date', None), u'<input type="text" name="date" />')
+        d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548)
+        self.assertEqual(str(d), '2007-09-17 12:51:34.482548')
+
+        # The microseconds are trimmed on display, by default.
+        self.assertEqual(w.render('date', d), u'<input type="text" name="date" value="2007-09-17 12:51:34" />')
+        self.assertEqual(w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34)), u'<input type="text" name="date" value="2007-09-17 12:51:34" />')
+        self.assertEqual(w.render('date', datetime.datetime(2007, 9, 17, 12, 51)), u'<input type="text" name="date" value="2007-09-17 12:51:00" />')
+
+        # Use 'format' to change the way a value is displayed.
+        w = DateTimeInput(format='%d/%m/%Y %H:%M')
+        self.assertEqual(w.render('date', d), u'<input type="text" name="date" value="17/09/2007 12:51" />')
+        self.assertFalse(w._has_changed(d, '17/09/2007 12:51'))
+
+        # Make sure a custom format works with _has_changed. The hidden input will use
+        data = datetime.datetime(2010, 3, 6, 12, 0, 0)
+        custom_format = '%d.%m.%Y %H:%M'
+        w = DateTimeInput(format=custom_format)
+        self.assertFalse(w._has_changed(formats.localize_input(data), data.strftime(custom_format)))
+
+    def test_dateinput(self):
+        w = DateInput()
+        self.assertEqual(w.render('date', None), u'<input type="text" name="date" />')
+        d = datetime.date(2007, 9, 17)
+        self.assertEqual(str(d), '2007-09-17')
+
+        self.assertEqual(w.render('date', d), u'<input type="text" name="date" value="2007-09-17" />')
+        self.assertEqual(w.render('date', datetime.date(2007, 9, 17)), u'<input type="text" name="date" value="2007-09-17" />')
+
+        # We should be able to initialize from a unicode value.
+        self.assertEqual(w.render('date', u'2007-09-17'), u'<input type="text" name="date" value="2007-09-17" />')
+
+        # Use 'format' to change the way a value is displayed.
+        w = DateInput(format='%d/%m/%Y')
+        self.assertEqual(w.render('date', d), u'<input type="text" name="date" value="17/09/2007" />')
+        self.assertFalse(w._has_changed(d, '17/09/2007'))
+
+        # Make sure a custom format works with _has_changed. The hidden input will use
+        data = datetime.date(2010, 3, 6)
+        custom_format = '%d.%m.%Y'
+        w = DateInput(format=custom_format)
+        self.assertFalse(w._has_changed(formats.localize_input(data), data.strftime(custom_format)))
+
+    def test_timeinput(self):
+        w = TimeInput()
+        self.assertEqual(w.render('time', None), u'<input type="text" name="time" />')
+        t = datetime.time(12, 51, 34, 482548)
+        self.assertEqual(str(t), '12:51:34.482548')
+
+        # The microseconds are trimmed on display, by default.
+        self.assertEqual(w.render('time', t), u'<input type="text" name="time" value="12:51:34" />')
+        self.assertEqual(w.render('time', datetime.time(12, 51, 34)), u'<input type="text" name="time" value="12:51:34" />')
+        self.assertEqual(w.render('time', datetime.time(12, 51)), u'<input type="text" name="time" value="12:51:00" />')
+
+        # We should be able to initialize from a unicode value.
+        self.assertEqual(w.render('time', u'13:12:11'), u'<input type="text" name="time" value="13:12:11" />')
+
+        # Use 'format' to change the way a value is displayed.
+        w = TimeInput(format='%H:%M')
+        self.assertEqual(w.render('time', t), u'<input type="text" name="time" value="12:51" />')
+        self.assertFalse(w._has_changed(t, '12:51'))
+
+        # Make sure a custom format works with _has_changed. The hidden input will use
+        data = datetime.time(13, 0)
+        custom_format = '%I:%M %p'
+        w = TimeInput(format=custom_format)
+        self.assertFalse(w._has_changed(formats.localize_input(data), data.strftime(custom_format)))
+
+    def test_splithiddendatetime(self):
+        from django.forms.widgets import SplitHiddenDateTimeWidget
+
+        w = SplitHiddenDateTimeWidget()
+        self.assertEqual(w.render('date', ''), u'<input type="hidden" name="date_0" /><input type="hidden" name="date_1" />')
+        d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548)
+        self.assertEqual(str(d), '2007-09-17 12:51:34.482548')
+        self.assertEqual(w.render('date', d), u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:34" />')
+        self.assertEqual(w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34)), u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:34" />')
+        self.assertEqual(w.render('date', datetime.datetime(2007, 9, 17, 12, 51)), u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:00" />')
+
+
+class FormsI18NWidgetsTestCase(TestCase):
+    def setUp(self):
+        super(FormsI18NWidgetsTestCase, self).setUp()
+        self.old_use_l10n = getattr(settings, 'USE_L10N', False)
+        settings.USE_L10N = True
+        activate('de-at')
+
+    def tearDown(self):
+        deactivate()
+        settings.USE_L10N = self.old_use_l10n
+        super(FormsI18NWidgetsTestCase, self).tearDown()
+
+    def test_splitdatetime(self):
+        w = SplitDateTimeWidget(date_format='%d/%m/%Y', time_format='%H:%M')
+        self.assertTrue(w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'06.05.2008', u'12:41']))
+
+    def test_datetimeinput(self):
+        w = DateTimeInput()
+        d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548)
+        w.is_localized = True
+        self.assertEqual(w.render('date', d), u'<input type="text" name="date" value="17.09.2007 12:51:34" />')
+
+    def test_dateinput(self):
+        w = DateInput()
+        d = datetime.date(2007, 9, 17)
+        w.is_localized = True
+        self.assertEqual(w.render('date', d), u'<input type="text" name="date" value="17.09.2007" />')
+
+    def test_timeinput(self):
+        w = TimeInput()
+        t = datetime.time(12, 51, 34, 482548)
+        w.is_localized = True
+        self.assertEqual(w.render('time', t), u'<input type="text" name="time" value="12:51:34" />')
+
+    def test_splithiddendatetime(self):
+        from django.forms.widgets import SplitHiddenDateTimeWidget
+
+        w = SplitHiddenDateTimeWidget()
+        w.is_localized = True
+        self.assertEqual(w.render('date', datetime.datetime(2007, 9, 17, 12, 51)), u'<input type="hidden" name="date_0" value="17.09.2007" /><input type="hidden" name="date_1" value="12:51:00" />')
+
+
+class SelectAndTextWidget(MultiWidget):
+    """
+    MultiWidget subclass
+    """
+    def __init__(self, choices=[]):
+        widgets = [
+            RadioSelect(choices=choices),
+            TextInput
+        ]
+        super(SelectAndTextWidget, self).__init__(widgets)
+
+    def _set_choices(self, choices):
+        """
+        When choices are set for this widget, we want to pass those along to the Select widget
+        """
+        self.widgets[0].choices = choices
+    def _get_choices(self):
+        """
+        The choices for this widget are the Select widget's choices
+        """
+        return self.widgets[0].choices
+    choices = property(_get_choices, _set_choices)
+
+
+class WidgetTests(TestCase):
+    def test_12048(self):
+        # See ticket #12048.
+        w1 = SelectAndTextWidget(choices=[1,2,3])
+        w2 = copy.deepcopy(w1)
+        w2.choices = [4,5,6]
+        # w2 ought to be independent of w1, since MultiWidget ought
+        # to make a copy of its sub-widgets when it is copied.
+        self.assertEqual(w1.choices, [1,2,3])
+
+    def test_13390(self):
+        # See ticket #13390
+        class SplitDateForm(Form):
+            field = DateTimeField(widget=SplitDateTimeWidget, required=False)
+
+        form = SplitDateForm({'field': ''})
+        self.assertTrue(form.is_valid())
+        form = SplitDateForm({'field': ['', '']})
+        self.assertTrue(form.is_valid())
+
+        class SplitDateRequiredForm(Form):
+            field = DateTimeField(widget=SplitDateTimeWidget, required=True)
+
+        form = SplitDateRequiredForm({'field': ''})
+        self.assertFalse(form.is_valid())
+        form = SplitDateRequiredForm({'field': ['', '']})
+        self.assertFalse(form.is_valid())
+