Changeset 5135

Timestamp:

05/01/07 10:33:10 (1 year ago)

Author:

bouldersprinters

Message:

boulder-oracle-sprint: Merged to [5134]

Files:

• django/branches/boulder-oracle-sprint/AUTHORS (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/django/contrib/localflavor/ch (copied) (copied from django/trunk/django/contrib/localflavor/ch)
• django/branches/boulder-oracle-sprint/django/contrib/localflavor/ch/ch_states.py (copied) (copied from django/trunk/django/contrib/localflavor/ch/ch_states.py)
• django/branches/boulder-oracle-sprint/django/contrib/localflavor/ch/forms.py (copied) (copied from django/trunk/django/contrib/localflavor/ch/forms.py)
• django/branches/boulder-oracle-sprint/django/contrib/localflavor/ch/__init__.py (copied) (copied from django/trunk/django/contrib/localflavor/ch/__init__.py)
• django/branches/boulder-oracle-sprint/django/core/management.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/db/models/fields/__init__.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/db/models/query.py (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/docs/settings.txt (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/modeltests/custom_columns/models.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/modeltests/lookup/models.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/modeltests/many_to_one/models.py (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/tests/modeltests/reverse_lookup/models.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/regressiontests/forms/localflavor.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/regressiontests/null_queries/models.py (modified) (1 diff)

django/branches/boulder-oracle-sprint/AUTHORS

@@ -182 +182 @@
-    plisk
-    Daniel Poelzleithner <http://poelzi.org/>
+    polpak@yahoo.com
-    J. Rademaker
-    Michael Radziej <mir@noris.de>
@@ -225 +226 @@
-    Dan Watson <http://theidioteque.net/>
-    Chris Wesseling <Chris.Wesseling@cwi.nl>
+    charly.wilhelm@gmail.com
-    Rachel Willmer <http://www.willmer.com/kb/>
-    Gary Wilson <gary.wilson@gmail.com>

django/branches/boulder-oracle-sprint/django/core/management.py

@@ -599 +599 @@
-    # is a model we've just created)
-    for app in models.get_apps():
+        app_name = app.__name__.split('.')[-2]
-        for model in models.get_models(app):
-            if model in created_models:

django/branches/boulder-oracle-sprint/django/db/models/fields/__init__.py

@@ -894 +894 @@
-        return [oldforms.USStateField]
-
+    def formfield(self, **kwargs):
+        from django.contrib.localflavor.us.forms import USStateSelect
+        defaults = {'widget': USStateSelect}
+        defaults.update(kwargs)
+        return super(USStateField, self).formfield(**defaults)
+
-class XMLField(TextField):
-    def __init__(self, verbose_name=None, name=None, schema_path=None, **kwargs):

django/branches/boulder-oracle-sprint/django/db/models/query.py

@@ -904 +904 @@
-    return matches[0]
-
+def field_choices(field_list, related_query):
+    if related_query:
+        choices = [f.field.related_query_name() for f in field_list]
+    else:
+        choices = [f.name for f in field_list]
+    return choices
+
-def lookup_inner(path, lookup_type, value, opts, table, column):
-    qn = backend.quote_name
@@ -988 +995 @@
-        pass
-    else: # No match found.
-
+
+
+
+
+
-
-    # Check whether an intermediate join is required between current_table

django/branches/boulder-oracle-sprint/docs/settings.txt

@@ -501 +501 @@
----------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-Generally, the default value should suffice. Only set this setting if you want

django/branches/boulder-oracle-sprint/tests/modeltests/custom_columns/models.py

@@ -72 +72 @@
-Traceback (most recent call last):
-    ...
-
+, choices are: article, id, first_name, last_name
-
->>> a = Author.objects.get(last_name__exact='Smith')

django/branches/boulder-oracle-sprint/tests/modeltests/lookup/models.py

@@ -224 +224 @@
-Traceback (most recent call last):
-    ...
-
+, choices are: id, headline, pub_date
-
->>> Article.objects.filter(headline__starts='Article')
-Traceback (most recent call last):
-    ...
-
+, choices are: id, headline, pub_date
-
-"""}

django/branches/boulder-oracle-sprint/tests/modeltests/many_to_one/models.py

@@ -175 +175 @@
-Traceback (most recent call last):
-    ...
-
+, choices are: id, headline, pub_date, reporter
-
-# You need to specify a comparison clause
@@ -181 +181 @@
-Traceback (most recent call last):
-    ...
-
+, choices are: id, headline, pub_date, reporter
-
-# You can also instantiate an Article by passing

django/branches/boulder-oracle-sprint/tests/modeltests/reverse_lookup/models.py

@@ -56 +56 @@
-Traceback (most recent call last):
-    ...
-
+, choices are: poll_choice, related_choice, id, question, creator
-"""}

django/branches/boulder-oracle-sprint/tests/regressiontests/forms/localflavor.py

@@ -1012 +1012 @@
-ValidationError: [u'Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format.']
-
+# CHZipCodeField ############################################################
+
+>>> from django.contrib.localflavor.ch.forms import CHZipCodeField
+>>> f = CHZipCodeField()
+>>> f.clean('800x')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXX.']
+>>> f.clean('80 00')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a zip code in the format XXXX.']
+>>> f.clean('8000')
+u'8000'
+
+# CHPhoneNumberField ########################################################
+
+>>> from django.contrib.localflavor.ch.forms import CHPhoneNumberField
+>>> f = CHPhoneNumberField()
+>>> f.clean('01234567890')
+Traceback (most recent call last):
+...
+ValidationError: [u'Phone numbers must be in 0XX XXX XX XX format.']
+>>> f.clean('1234567890')
+Traceback (most recent call last):
+...
+ValidationError: [u'Phone numbers must be in 0XX XXX XX XX format.']
+>>> f.clean('0123456789')
+u'012 345 67 89'
+
+# CHIdentityCardNumberField #################################################
+
+>>> from django.contrib.localflavor.ch.forms import CHIdentityCardNumberField
+>>> f = CHIdentityCardNumberField()
+>>> f.clean('C1234567<0')
+u'C1234567<0'
+>>> f.clean('C1234567<1')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.']
+>>> f.clean('2123456700')
+u'2123456700'
+>>> f.clean('2123456701')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format.']
+
+# CHStateSelect #############################################################
+
+>>> from django.contrib.localflavor.ch.forms import CHStateSelect
+>>> w = CHStateSelect()
+>>> w.render('state', 'AG')
+u'<select name="state">\n<option value="AG" selected="selected">Aargau</option>\n<option value="AI">Appenzell Innerrhoden</option>\n<option value="AR">Appenzell Ausserrhoden</option>\n<option value="BS">Basel-Stadt</option>\n<option value="BL">Basel-Land</option>\n<option value="BE">Berne</option>\n<option value="FR">Fribourg</option>\n<option value="GE">Geneva</option>\n<option value="GL">Glarus</option>\n<option value="GR">Graubuenden</option>\n<option value="JU">Jura</option>\n<option value="LU">Lucerne</option>\n<option value="NE">Neuchatel</option>\n<option value="NW">Nidwalden</option>\n<option value="OW">Obwalden</option>\n<option value="SH">Schaffhausen</option>\n<option value="SZ">Schwyz</option>\n<option value="SO">Solothurn</option>\n<option value="SG">St. Gallen</option>\n<option value="TG">Thurgau</option>\n<option value="TI">Ticino</option>\n<option value="UR">Uri</option>\n<option value="VS">Valais</option>\n<option value="VD">Vaud</option>\n<option value="ZG">Zug</option>\n<option value="ZH">Zurich</option>\n</select>'
+
-## AUPostCodeField ##########################################################
-

django/branches/boulder-oracle-sprint/tests/regressiontests/null_queries/models.py

@@ -33 +33 @@
-Traceback (most recent call last):
-...
-
+, choices are: id, poll, choice
-
-# Can't use None on anything other than __exact