Changeset 5114

Timestamp:

04/27/07 15:21:28 (2 years ago)

Author:

bouldersprinters

Message:

boulder-oracle-sprint: Merged to [5113]

Files:

• django/branches/boulder-oracle-sprint/AUTHORS (modified) (4 diffs)
• django/branches/boulder-oracle-sprint/django/conf/locale/el/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/boulder-oracle-sprint/django/conf/locale/el/LC_MESSAGES/django.po (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/django/conf/locale/no/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/boulder-oracle-sprint/django/conf/locale/no/LC_MESSAGES/djangojs.po (modified) (4 diffs)
• django/branches/boulder-oracle-sprint/django/conf/locale/no/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/boulder-oracle-sprint/django/conf/locale/no/LC_MESSAGES/django.po (modified) (36 diffs)
• django/branches/boulder-oracle-sprint/django/core/management.py (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/django/newforms/forms.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/template/__init__.py (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/docs/email.txt (modified) (1 diff)
• django/branches/boulder-oracle-sprint/docs/forms.txt (modified) (3 diffs)
• django/branches/boulder-oracle-sprint/docs/settings.txt (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/regressiontests/forms/localflavor.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/regressiontests/forms/tests.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/regressiontests/templates/tests.py (modified) (2 diffs)

django/branches/boulder-oracle-sprint/AUTHORS

@@ -43 +43 @@
-
-    adurdin@gmail.com
+    alang@bright-green.com
-    Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>
-    Andreas
@@ -165 +166 @@
-    Robert Myers <myer0052@gmail.com>
-    Nebojša Dorđević
+    Gopal Narayanan <gopastro@gmail.com>
-    Fraser Nevett <mail@nevett.org>
-    Sam Newman <http://www.magpiebrain.com/>
-    Neal Norwitz <nnorwitz@google.com>
-    oggie rob <oz.robharvey@gmail.com>
-    onaiort@gmail.com
-    Jay Parlar <parlar@gmail.com>
-    pavithran s <pavithran.s@gmail.com>
@@ -188 +189 @@
-    remco@diji.biz
-    rhettg@gmail.com
+    Henrique Romano <onaiort@gmail.com>
-    Armin Ronacher
-    Oliver Rutherfurd <http://rutherfurd.net/>
-    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
+    Vinay Sajip <vinay_sajip@yahoo.co.uk>
-    David Schein
-    scott@staplefish.com
@@ -214 +217 @@
-    Karen Tracey <graybark@bellsouth.net>
-    Makoto Tsuyuki <mtsuyuki@gmail.com>
+    tt@gurgle.no
-    Amit Upadhyay
-    Geert Vanderkelen

django/branches/boulder-oracle-sprint/django/conf/locale/el/LC_MESSAGES/django.po

@@ -11 +11 @@
-"POT-Creation-Date: 2006-05-16 10:13+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-panos laganakos <panos.laganakos@gmail.com
+Orestis Markou <orestis@orestis.gr
-"Language-Team: Greek\n"
-"MIME-Version: 1.0\n"
@@ -165 +165 @@
-"%(text)s"
-msgstr ""
-χρήστη)ες
+user)s
-"\n"
-κείμενο)α
+text)s
-
-#: contrib/comments/models.py:265

django/branches/boulder-oracle-sprint/django/conf/locale/no/LC_MESSAGES/djangojs.po

@@ -1 @@
-SOME DESCRIPTIVE TITLE.
+translation of djangojs.po to
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
@@ -6 +6 @@
-msgid ""
-msgstr ""
-PACKAGE VERSION
+djangojs
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 11:51+0100\n"
-YEAR-MO-DA HO:MI+ZONE
-Espen Grindhaug <espen.grindhaug@gmail.com>
-no
+2007-04-27 06:51+0200
+
+ <en@li.org>
-"MIME-Version: 1.0\n"
-utf
+UTF
-"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
-
-#: contrib/admin/media/js/SelectFilter2.js:33
@@ -22 +23 @@
-
-#: contrib/admin/media/js/SelectFilter2.js:41
-#, fuzzy
-msgid "Choose all"
-msgstr "Velg alle"
@@ -117 +117 @@
-msgid "Tomorrow"
-msgstr "I morgen"
+

django/branches/boulder-oracle-sprint/django/conf/locale/no/LC_MESSAGES/django.po

@@ -1 @@
-SOME DESCRIPTIVE TITLE.
+translation of django.po to
-# Copyright (C) 2005 and beyond
-# This file is distributed under the same license as the PACKAGE package.
@@ -7 +7 @@
-msgid ""
-msgstr ""
-PACKAGE VERSION
+django
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:12+0200\n"
-YEAR-MO-DA HO:MI+ZONE
-Espen Grndhaug <espen@grindhaug.org>
-Norwegian
+2007-04-27 06:48+0200
+
+ <en@li.org>
-"MIME-Version: 1.0\n"
-utf
+UTF
-"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
-
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
-#, fuzzy
-msgid "object ID"
-Vis 
+
-
-#: contrib/comments/models.py:68
-msgid "headline"
-
+overskrift
-
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-#, fuzzy
-msgid "comment"
-innhold
+kommentar
-
-#: contrib/comments/models.py:70
-msgid "rating #1"
-
+rangering #1 
-
-#: contrib/comments/models.py:71
-msgid "rating #2"
-
+rangering #2
-
-#: contrib/comments/models.py:72
-msgid "rating #3"
-
+rangering #3
-
-#: contrib/comments/models.py:73
-msgid "rating #4"
-
+rangering #4
-
-#: contrib/comments/models.py:74
-msgid "rating #5"
-
+rangering #5
-
-#: contrib/comments/models.py:75
-msgid "rating #6"
-
+rangering #6
-
-#: contrib/comments/models.py:76
-msgid "rating #7"
-
+rangering #7
-
-#: contrib/comments/models.py:77
-msgid "rating #8"
-
+rangering #8
-
-#: contrib/comments/models.py:82
-msgid "is valid rating"
-
+er gyldig rangering
-
-#: contrib/comments/models.py:83 contrib/comments/models.py:169
-msgid "date/time submitted"
-
+dato/tid for innsendelse
-
-#: contrib/comments/models.py:84 contrib/comments/models.py:170
-msgid "is public"
-
+er tilgjengelig for alle
-
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289
@@ -82 +81 @@
-#: contrib/comments/models.py:86
-msgid "is removed"
-
+er fjernet
-
-#: contrib/comments/models.py:86
@@ -88 +87 @@
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-
+Aktiver denne avkryssningsboksen hvis kommentaren er upasende. Beskjeden \"Denne kommentaren er blitt fjernet\" vil bli vist istedet.
-
-#: contrib/comments/models.py:91
-#, fuzzy
-msgid "comments"
-innhold
+kommentarer
-
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
-#, fuzzy
-msgid "Content object"
- type
+objekt
-
-#: contrib/comments/models.py:159
@@ -109 +106 @@
-"http://%(domain)s%(url)s"
-msgstr ""
+"Sendt av %(user)s på %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
-
-#: contrib/comments/models.py:168
-#, fuzzy
-msgid "person's name"
-for
+personens 
-
-#: contrib/comments/models.py:171
-#, fuzzy
-msgid "ip address"
-msgstr "IP adresse"
@@ -122 +122 @@
-#: contrib/comments/models.py:173
-msgid "approved by staff"
-
+godkjent av moderator
-
-#: contrib/comments/models.py:176
-#, fuzzy
-msgid "free comment"
-tillat kommentare
+åpen kommenta
-
-#: contrib/comments/models.py:177
-#, fuzzy
-msgid "free comments"
-tillat
+åpne
-
-#: contrib/comments/models.py:233
-msgid "score"
-
+poeng
-
-#: contrib/comments/models.py:234
-#, fuzzy
-msgid "score date"
-utløps
+poeng 
-
-#: contrib/comments/models.py:237
-msgid "karma score"
-
+karma poeng
-
-#: contrib/comments/models.py:238
-msgid "karma scores"
-
+karma poeng
-
-#: contrib/comments/models.py:242
-#, python-format
-msgid "%(score)d rating by %(user)s"
-
+%(score)d rangering av %(user)s
-
-#: contrib/comments/models.py:258
-fuzzy, 
+
-msgid ""
-"This comment was flagged by %(user)s:\n"
@@ -163 +160 @@
-"%(text)s"
-msgstr ""
-skrevet med lite omtanke
+flagget av %(user)s
-"\n"
-"%(text)s"
-
-#: contrib/comments/models.py:265
-#, fuzzy
-msgid "flag date"
-tside
+gg dato
-
-#: contrib/comments/models.py:268
-#, fuzzy
-msgid "user flag"
-Bruker
+brukerflag
-
-#: contrib/comments/models.py:269
-#, fuzzy
-msgid "user flags"
-Brukere
+brukerflag
-
-#: contrib/comments/models.py:273
-#, python-format
-msgid "Flag by %r"
-
+Flagg med %r
-
-#: contrib/comments/models.py:278
-#, fuzzy
-msgid "deletion date"
-sesjon data
+fjernet dato
-
-#: contrib/comments/models.py:280
-msgid "moderator deletion"
-
+fjernet av  moderator
-
-#: contrib/comments/models.py:281
-msgid "moderator deletions"
-
+fjernet av moderator
-
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-
+Fjernet av moderator med %r
-
-#: contrib/comments/views/karma.py:19
@@ -215 +208 @@
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
-
+på deg 
-
-#: contrib/comments/views/comments.py:28
-
-
-
-
+
+
-
-#: contrib/comments/views/comments.py:112
-fuzzy, 
+
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
@@ -247 +238 @@
-
-#: contrib/comments/views/comments.py:117
-fuzzy, 
+
-msgid ""
-"This comment was posted by a sketchy user:\n"
@@ -253 +244 @@
-"%(text)s"
-msgstr ""
-med lite omtanke
+av en upålitelig bruker
-"\n"
-"%(text)s"
@@ -282 +273 @@
-#: contrib/comments/views/comments.py:321
-msgid "The comment form didn't provide either 'preview' or 'post'"
-
-
+
-
-#: contrib/comments/templates/comments/form.html:6
@@ -297 +287 @@
-
-#: contrib/comments/templates/comments/form.html:6
-#, fuzzy
-msgid "Forgotten your password?"
-Endre passord
+Har du glemt passordet ditt ?
-
-#: contrib/comments/templates/comments/form.html:8
@@ -324 +313 @@
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-
+Rangeringer
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-
+Påkrevd
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-
+Valgfri
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-
+Send et foto
-
-#: contrib/comments/templates/comments/form.html:27
-#: contrib/comments/templates/comments/freeform.html:5
-#, fuzzy
-msgid "Comment:"
-tillat kommentarer
+Kommentar:
-
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-#, fuzzy
-msgid "Preview comment"
-tillat kommentare
+Forhåndvis kommenta
-
-#: contrib/comments/templates/comments/freeform.html:4
-#, fuzzy
-msgid "Your name:"
-brukernavn
+Ditt navn:
-
-#: contrib/admin/filterspecs.py:40
@@ -417 +403 @@
-#: contrib/admin/models.py:21
-msgid "action flag"
- 
+
-
-#: contrib/admin/models.py:22
@@ -425 +411 @@
-#: contrib/admin/models.py:25
-msgid "log entry"
-notis
+post
-
-#: contrib/admin/models.py:26
-msgid "log entries"
-innlegg
+poster
-
-#: contrib/admin/templatetags/admin_list.py:228
@@ -441 +427 @@
-"sensitive."
-msgstr ""
-ær snill å angi korrekt brukernavn og passord. La merke til
-
+ennligst angi korrekt brukernavn og passord. Merk
+t
-
-#: contrib/admin/views/decorators.py:23
@@ -453 +439 @@
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-
-
-
+
-
-#: contrib/admin/views/decorators.py:68
@@ -462 +446 @@
-"cookies, reload this page, and try again."
-msgstr ""
-
-
-
+
+
-
-#: contrib/admin/views/decorators.py:82
@@ -501 +484 @@
-#, python-format
-msgid "Added %s."
-gt
+
-
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
@@ -529 +512 @@
-#: contrib/admin/views/main.py:354
-#, python-format
-
-
+
-msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
-
@@ -743 +725 @@
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-vær
-mail, og vil
+oppståt
+post, og vi
-
-#: contrib/admin/templates/admin/404.html:4
@@ -910 +892 @@
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-å bruke tid på internett siden i 
+at du valgte å bruke kvalitetstid på nettstedet i
-
-#: contrib/admin/templates/registration/logged_out.html:10
@@ -955 +937 @@
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-
-
+
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
@@ -1003 +984 @@
-"your computer is \"internal\").</p>\n"
-msgstr ""
+"\n"
+"<p class=\"help\">For å installere bokmerker, dra linken til verktøylinja\n"
+"for bokmerker, eller høyreklikk og legg til i bokmerker. Nå kan du du velge\n"
+"bokmerket fra hvilken som helst side på nettstedet. Noen av disse\n"
+"bokmerkene krever at datamaskinen du bruker er markert som \"intern\"\n"
+"(kontakt din systemadministrator hvis du er usikker på om maskinen din er \"intern\").</p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
@@ -1034 +1021 @@
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-
-
+
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
@@ -1070 +1056 @@
-"events/search/'."
-msgstr ""
-nne burde vær
+tte burde vært
-"nyheter/les/"
-
@@ -1082 +1068 @@
-"'http://'."
-msgstr ""
-nn
+tt
-"internettadresse som starter med 'http://'"
-
@@ -1094 +1080 @@
-
-#: contrib/flatpages/models.py:8
-
-
-
-
+
+
-
-#: contrib/flatpages/models.py:9
@@ -1187 +1171 @@
-#: contrib/auth/models.py:59
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-
+Bruk '[algo]$[salt]$[hexdigest]'
-
-#: contrib/auth/models.py:60
@@ -1257 +1241 @@
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-
+Din nettleser ser ikkeut til å støtte informasjonskapsler (cookies). Informasjonskapsler er påkrevd for å logge inn.
-
-#: contrib/contenttypes/models.py:25
@@ -1699 +1683 @@
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-
-
+
-
-#: core/validators.py:167
@@ -1785 +1768 @@
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-
-
+
-msgstr[0] "Skriv inn et desimal tall med maksimum %s total antall tall."
-msgstr[1] "Skriv inn et desimal tall med maksimum %s total antall tall."
@@ -1793 +1775 @@
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-
-
+
-msgstr[0] "Skriv inn et desimal tall med maksimum %s tall bak komma. "
-msgstr[1] "Skriv inn et desimal tall med maksimum %s tall bak komma. "
@@ -1801 +1782 @@
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-
-
+
-
-#: core/validators.py:363
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-
-
+
-
-#: core/validators.py:376
@@ -1825 +1804 @@
-#: core/validators.py:429
-#, python-format
-
-
+
-msgstr ""
-"Internettadressen %(url)s returnerte en ikke godkjent Content-Type '%"
@@ -1927 +1905 @@
-
-#: db/models/fields/related.py:581
-
-
-
-
+
+
-
-#: db/models/fields/related.py:625
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-
-
+
-msgstr[0] "Skriv inn gyldige %(self)s ID-er. Verdien %(value)r er ikke gyldig."
-msgstr[1] "Skriv inn gyldige %(self)s ID-er. Verdiene %(value)r er ikke gyldige."

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

@@ -174 +174 @@
-        if isinstance(f, (models.ForeignKey, models.OneToOneField)):
-            rel_field = f.rel.get_related_field()
+            while isinstance(rel_field, (models.ForeignKey, models.OneToOneField)):
+                rel_field = rel_field.rel.get_related_field()
-            data_type = get_rel_data_type(rel_field)
-        else:
@@ -1377 +1379 @@
-    from django.conf import settings
-    import sys
+
+    disable_termcolors()
-
-    # Keep a count of the installed objects and fixtures

django/branches/boulder-oracle-sprint/django/newforms/forms.py

@@ -123 +123 @@
-                if errors_on_separate_row and bf_errors:
-                    output.append(error_row % bf_errors)
-
+
+
+
+
+
+
+
+
-                if field.help_text:
-                    help_text = help_text_html % field.help_text

django/branches/boulder-oracle-sprint/django/template/__init__.py

@@ -194 +194 @@
-    def tokenize(self):
-        "Return a list of tokens from a given template_string"
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else:
-            token = Token(TOKEN_TEXT, token_string)
@@ -216 +225 @@
-    def tokenize(self):
-        "Return a list of tokens from a given template_string"
-token_tups
+result
-        for match in tag_re.finditer(self.template_string):
-            start, end = match.span()
-            if start > upto:
-token_tups.append( (self.template_string[upto:start], (upto, start)) 
+result.append(self.create_token(self.template_string[upto:start], (upto, start), False)
-                upto = start
-token_tups.append( (self.template_string[start:end], (start,end)) 
+result.append(self.create_token(self.template_string[start:end], (start, end), True)
-            upto = end
-        last_bit = self.template_string[upto:]
-        if last_bit:
-token_tups.append( (last_bit, (upto, upto + len(last_bit))) 
-[self.create_token(tok, (self.origin, loc)) for tok, loc in token_tups]
-
-
-
+result.append(self.create_token(last_bit, (upto, upto + len(last_bit)), False)
+result
+
+, in_tag
+, in_tag
-        token.source = source
-        return token

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

@@ -20 +20 @@
-    send_mail('Subject here', 'Here is the message.', 'from@example.com',
-        ['to@example.com'], fail_silently=False)
-
+
+
+
+
+
+
-.. note::
-
-    The character set of email sent with ``django.core.mail`` will be set to
-    the value of your `DEFAULT_CHARSET setting`_.
-
+
-.. _DEFAULT_CHARSET setting: ../settings/#DEFAULT_CHARSET
+.. _EMAIL_HOST: ../settings/#EMAIL_HOST
+.. _EMAIL_PORT: ../settings/#EMAIL_PORT
+.. _EMAIL_HOST_USER: ../settings/#EMAIL_HOST_USER
+.. _EMAIL_HOST_PASSWORD: ../settings/#EMAIL_HOST_PASSWORD
+
-
-send_mail()

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

@@ -518 +518 @@
----------------------------
-
- 
+
-if the field is required, Django checks that it is present and non-empty. Then,
-if that test passes *and the form submission contained data* for that field, all
@@ -616 +616 @@
-    against the current field.
-
+``RequiredIfOtherFieldGiven``
+    Takes a field name of the current field is only required if the other
+    field has a value.
+
+``RequiredIfOtherFieldsGiven``
+    Similar to ``RequiredIfOtherFieldGiven``, except that it takes a list of
+    field names and if any one of the supplied fields has a value provided,
+    the current field being validated is required.
+
-``RequiredIfOtherFieldNotGiven``
-    Takes the name of the other field and this field is only required if the
-    other field has no value.
-
-``RequiredIfOtherFieldsNotGiven``
-    Similar to ``RequiredIfOtherFieldNotGiven``, except that it takes a list
-    of field names and if any one of the supplied fields does not have a value
-    provided, the field being validated is required.
-
-``RequiredIfOtherFieldEquals`` and ``RequiredIfOtherFieldDoesNotEqual``
@@ -651 +655 @@
-    Takes two boundary numbers, ``lower`` and ``upper``, and checks that the
-    field is greater than ``lower`` (if given) and less than ``upper`` (if
-  
-
+
+
-    Both checks are inclusive. That is, ``NumberIsInRange(10, 20)`` will allow
-    values of both 10 and 20. This validator only checks numeric values

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

@@ -396 +396 @@
-Default: ``''`` (Empty string)
-
-
-
+
+
+
-
-See also ``EMAIL_HOST_USER``.

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

@@ -875 +875 @@
-u''
-
+# BRCPFField #################################################################
+
+>>> from django.contrib.localflavor.br.forms import BRCPFField
+>>> f = BRCPFField()
+>>> 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.']
+>>> f.clean('489.294.654-54')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CPF number.']
+>>> f.clean('295.669.575-98')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CPF number.']
+>>> f.clean('539.315.127-22')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CPF number.']
+>>> f.clean('663.256.017-26')
+u'663.256.017-26'
+>>> f.clean('66325601726')
+u'66325601726'
+>>> f.clean('375.788.573-20')
+u'375.788.573-20'
+>>> f.clean('84828509895')
+u'84828509895'
+>>> f.clean('375.788.573-XX')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires only numbers.']
+>>> f.clean('375.788.573-000')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure this value has at most 14 characters.']
+>>> f.clean('123.456.78')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure this value has at least 11 characters.']
+>>> f.clean('123456789555')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires at most 11 digits or 14 characters.']
+>>> f = BRCPFField(required=False)
+>>> f.clean('')
+u''
+>>> f.clean(None)
+u''
+
-# BRPhoneNumberField #########################################################
-

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

@@ -2602 +2602 @@
-<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.')
+>>> print 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>
+>>> print 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="t