Changeset 7922

Timestamp:

07/14/08 00:04:57 (4 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7917].

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/AUTHORS (modified) (1 diff)
• django/branches/newforms-admin/django/conf/locale/it/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/it/LC_MESSAGES/django.po (modified) (22 diffs)
• django/branches/newforms-admin/django/core/files/uploadedfile.py (modified) (1 diff)
• django/branches/newforms-admin/django/core/management/commands/syncdb.py (modified) (3 diffs)
• django/branches/newforms-admin/django/core/management/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/fields/__init__.py (modified) (7 diffs)
• django/branches/newforms-admin/django/db/models/query.py (modified) (3 diffs)
• django/branches/newforms-admin/django/db/models/sql/query.py (modified) (2 diffs)
• django/branches/newforms-admin/django/http/multipartparser.py (modified) (3 diffs)
• django/branches/newforms-admin/django/newforms/fields.py (modified) (1 diff)
• django/branches/newforms-admin/django/utils/itercompat.py (modified) (1 diff)
• django/branches/newforms-admin/docs/contributing.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/db-api.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/testing.txt (modified) (3 diffs)
• django/branches/newforms-admin/docs/tutorial01.txt (modified) (2 diffs)
• django/branches/newforms-admin/tests/modeltests/basic/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/model_forms/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/or_lookups/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/test_client/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/test_client/urls.py (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/test_client/views.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/admin_scripts/management/commands/app_command.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/admin_scripts/management/commands/base_command.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/admin_scripts/management/commands/label_command.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/admin_scripts/management/commands/noargs_command.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/admin_scripts/tests.py (modified) (32 diffs)
• django/branches/newforms-admin/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/file_uploads/tests.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/model_inheritance_regress/models.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/queries/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/utils/datastructures.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/utils/itercompat.py (copied) (copied from django/trunk/tests/regressiontests/utils/itercompat.py)
• django/branches/newforms-admin/tests/regressiontests/utils/tests.py (modified) (2 diffs)

django/branches/newforms-admin/AUTHORS

@@ -53 +53 @@
-    Fabrice Aneche <akh@nobugware.com>
-    ant9000@netwise.it
-
+ <florian@apolloner.eu>
-    arien <regexbot@gmail.com>
-    David Ascher <http://ascher.ca/>

django/branches/newforms-admin/django/conf/locale/it/LC_MESSAGES/django.po

@@ -7 +7 @@
-"Project-Id-Version: Django vSVN\n"
-"Report-Msgid-Bugs-To: \n"
-6-02 18:4
-5-18 19:13
+7-12 20:3
+7-12 20:45
-"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
-"Language-Team: Italiano\n"
@@ -17 +17 @@
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
-3
+4
-msgid "Arabic"
-msgstr "Arabo"
-
-4
+5
-msgid "Bengali"
-msgstr "Bengali"
-
-5
+6
-msgid "Bulgarian"
-msgstr "Bulgaro"
-
-6
+7
-msgid "Catalan"
-msgstr "Catalano"
-
-7
+8
-msgid "Czech"
-msgstr "Ceco"
-
-8
+9
-msgid "Welsh"
-msgstr "Gallese"
-
-49
+50
-msgid "Danish"
-msgstr "Danese"
-
-0
+1
-msgid "German"
-msgstr "Tedesco"
-
-1
+2
-msgid "Greek"
-msgstr "Greco"
-
-2
+3
-msgid "English"
-msgstr "Inglese"
-
-3
+4
-msgid "Spanish"
-msgstr "Spagnolo"
-
-
+
+
+
+
+
-msgid "Argentinean Spanish"
-msgstr "Spagnolo argentino"
-
-5
+7
-msgid "Basque"
-msgstr "Basco"
-
-6
+8
-msgid "Persian"
-msgstr "Persiano"
-
-7
+9
-msgid "Finnish"
-msgstr "Finlandese"
-
-58
+60
-msgid "French"
-msgstr "Francese"
-
-59
+61
-msgid "Irish"
-msgstr "Irlandese"
-
-0
+2
-msgid "Galician"
-msgstr "Galiziano"
-
-1
+3
-msgid "Hungarian"
-msgstr "Ungherese"
-
-2
+4
-msgid "Hebrew"
-msgstr "Ebraico"
-
-3
+5
-msgid "Croatian"
-msgstr "Croato"
-
-4
+6
-msgid "Icelandic"
-msgstr "Islandese"
-
-5
+7
-msgid "Italian"
-msgstr "Italiano"
-
-6
+8
-msgid "Japanese"
-msgstr "Giapponese"
-
-7
+9
-msgid "Georgian"
-msgstr "Georgiano"
-
-68
+70
-msgid "Korean"
-msgstr "Coreano"
-
-69
+71
-msgid "Khmer"
-msgstr "Khmer"
-
-0
+2
-msgid "Kannada"
-msgstr "Kannada"
-
-1
+3
-msgid "Latvian"
-msgstr "Lettone"
-
-
+
+
+
+
+
-msgid "Macedonian"
-msgstr "Macedone"
-
-3
+6
-msgid "Dutch"
-msgstr "Olandese"
-
-4
+7
-msgid "Norwegian"
-msgstr "Norvegese"
-
-5
+8
-msgid "Polish"
-msgstr "Polacco"
-
-6
+9
-msgid "Portugese"
-msgstr "Portoghese"
-
-77
+80
-msgid "Brazilian Portuguese"
-msgstr "Brasiliano Portoghese"
-
-78
+81
-msgid "Romanian"
-msgstr "Rumeno"
-
-79
+82
-msgid "Russian"
-msgstr "Russo"
-
-0
+3
-msgid "Slovak"
-msgstr "Slovacco"
-
-1
+4
-msgid "Slovenian"
-msgstr "Sloveno"
-
-2
+5
-msgid "Serbian"
-msgstr "Serbo"
-
-3
+6
-msgid "Swedish"
-msgstr "Svedese"
-
-4
+7
-msgid "Tamil"
-msgstr "Tamil"
-
-5
+8
-msgid "Telugu"
-msgstr "Telugu"
-
-6
+9
-msgid "Turkish"
-msgstr "Turco"
-
-87
+90
-msgid "Ukrainian"
-msgstr "Ucraino"
-
-88
+91
-msgid "Simplified Chinese"
-msgstr "Cinese semplificato"
-
-89
+92
-msgid "Traditional Chinese"
-msgstr "Cinese tradizionale"
@@ -1134 +1142 @@
-msgstr "gruppo"
-
-1
+8
-msgid "groups"
-msgstr "gruppi"
-
-1
+8
-msgid "username"
-msgstr "nome utente"
-
-1
+8
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
@@ -1150 +1158 @@
-"cifre e sottolineati)."
-
-2
+9
-msgid "first name"
-msgstr "nome"
-
-33
+40
-msgid "last name"
-msgstr "cognome"
-
-34
+41
-msgid "e-mail address"
-msgstr "indirizzo e-mail"
-
-35
+42
-msgid "password"
-msgstr "password"
-
-35
+42
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
@@ -1174 +1182 @@
-"di cambio password</a>."
-
-36
+43
-msgid "staff status"
-msgstr "privilegi di staff"
-
-36
+43
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica se l'utente può accedere a questo sito di amministrazione."
-
-37
+44
-msgid "active"
-msgstr "attivo"
-
-37
+44
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
@@ -1194 +1202 @@
-"qui, piuttosto che cancellare gli account."
-
-38
+45
-msgid "superuser status"
-msgstr "privilegi di superutente"
-
-38
+45
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
@@ -1206 +1214 @@
-"esplicitamente."
-
-39
+46
-msgid "last login"
-msgstr "ultimo accesso"
-
-0
+7
-msgid "date joined"
-msgstr "iscritto in data"
-
-2
+9
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
@@ -1222 +1230 @@
-"tutti i privilegi assegnati ad ogni gruppo cui appartiene."
-
-43
+50
-msgid "user permissions"
-msgstr "privilegi utente"
-
-47
+54
-msgid "user"
-msgstr "utente"
-
-48
+55
-msgid "users"
-msgstr "utenti"
-
-54
+60
-msgid "Personal info"
-msgstr "Informazioni personali"
-
-55
+61
-msgid "Permissions"
-msgstr "Permessi"
-
-56
+62
-msgid "Important dates"
-msgstr "Date importanti"
-
-57
+63
-msgid "Groups"
-msgstr "Gruppi"
-
-16
+23
-msgid "message"
-msgstr "messaggio"
-
-7
+9
-msgid "Logged out"
-msgstr "Accesso annullato"
@@ -3524 +3532 @@
-msgstr "redirezioni"
-
-1
+5
-msgid "session key"
-msgstr "chiave di sessione"
-
-2
+7
-msgid "session data"
-msgstr "dati di sessione"
-
-3
+8
-msgid "expire date"
-msgstr "data di scadenza"
-
-48
+53
-msgid "session"
-msgstr "sessione"
-
-49
+54
-msgid "sessions"
-msgstr "sessioni"
@@ -3608 +3616 @@
-msgstr "Questo valore non può essere composto solo da cifre."
-
-2
+7
-msgid "Enter a whole number."
-msgstr "Inserire un numero intero."
@@ -3625 +3633 @@
-msgstr "Data non valida: %s"
-
-48
+54
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Inserire una data valida in formato AAAA-MM-GG."
@@ -3633 +3641 @@
-msgstr "Inserire un ora valida in formato OO:MM."
-
-25
+31
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Inserire una data/ora valida in formato AAAA-MM-GG OO:MM."
-
-3
+8
-msgid "Enter a valid e-mail address."
-msgstr "Inserire un indirizzo e-mail valido."
-
-
-
+
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Non è stato inviato alcun file. Verificare il tipo di codifica della form."
-
-59
+68
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
@@ -3877 +3884 @@
-msgstr "Un %(object)s·con questo·%(type)s·esiste già per questo·%(field)s."
-
-4
+2
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "Un %(optname)s·con questo·%(fieldname)s·esiste già."
-
-79 db/models/fields/__init__.py:348
-0 db/models/fields/__init__.py:791
-46
+82 db/models/fields/__init__.py:354
+8 db/models/fields/__init__.py:799
+51
-msgid "This field is required."
-msgstr "Questo campo è obbligatorio."
-
-48
+54
-msgid "This value must be an integer."
-msgstr "Questo valore deve essere un intero."
-
-87
+93
-msgid "This value must be either True or False."
-msgstr "Questo valore deve essere True o False."
-
-1
+7
-msgid "This field cannot be null."
-msgstr "Questo campo non può essere nullo."
-
-89
+95
-msgid "This value must be a decimal number."
-msgstr "Questo valore deve essere un numero decimale."
-
-0
+8
-msgid "Enter a valid filename."
-msgstr "Inserire un nome di file valido."
-
-81
+99
-msgid "This value must be either None, True or False."
-msgstr "Questo valore deve essere None, True o False."
@@ -3917 +3924 @@
-msgstr "Inserire un %s valido."
-
-21
+56
-msgid "Separate multiple IDs with commas."
-msgstr "Separare gli ID multipli con virgole."
-
-23
+58
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
@@ -3927 +3934 @@
-"uno."
-
-770
+805
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
@@ -3934 +3941 @@
-msgstr[1] "Inserire ID validi per %(self)s. I valori %(value)r non sono validi."
-
-47
+52
-msgid "Enter a valid value."
-msgstr "Inserire un valore valido."
-
-4
+9
-#, python-format
-msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
@@ -3945 +3952 @@
-"(length)d)."
-
-25
+30
-#, python-format
-msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
@@ -3952 +3959 @@
-"(length)d)."
-
-3 newforms/fields.py:182 newforms/fields.py:211
+8 newforms/fields.py:187 newforms/fields.py:216
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Assicurarsi che questo valore sia minore o uguale a %s."
-
-4 newforms/fields.py:183 newforms/fields.py:212
+9 newforms/fields.py:188 newforms/fields.py:217
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Assicurarsi che questo valore sia maggiore o uguale a %s."
-
-1 newforms/fields.py:210
+6 newforms/fields.py:215
-msgid "Enter a number."
-msgstr "Inserire un numero."
-
-3
+8
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Assicurarsi che non vi siano più di %s cifre in totale."
-
-4
+9
-#, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Assicurarsi che non vi siano più di %s cifre decimali."
-
-15
+20
-#, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Assicurarsi che non vi siano più di %s cifre prima della virgola."
-
-3 newforms/fields.py:751
+8 newforms/fields.py:779
-msgid "Enter a valid date."
-msgstr "Inserire una data valida."
-
-296 newforms/fields.py:752
+301 newforms/fields.py:780
-msgid "Enter a valid time."
-msgstr "Inserire un ora valida."
-
-35
+40
-msgid "Enter a valid date/time."
-msgstr "Inserire una coppia data/ora valida."
-
-34
+27
-msgid "No file was submitted."
-msgstr "Nessun file è stato inviato."
-
-35 oldforms/__init__.py:689
+28 oldforms/__init__.py:693
-msgid "The submitted file is empty."
-msgstr "Il file inviato è vuoto."
-
-497
+522
-msgid "Enter a valid URL."
-msgstr "Inserire una URL valida."
-
-498
+523
-msgid "This URL appears to be a broken link."
-msgstr "Questa URL non sembra funzionare."
-
-60 newforms/models.py:299
+88 newforms/models.py:306
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
@@ -4015 +4022 @@
-"disponibili."
-
-599
+627
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Scegliere un'opzione valida. '%(value)s non compare tra quelle disponibili."
-
-00 newforms/fields.py:662 newforms/models.py:371
+28 newforms/fields.py:690 newforms/models.py:373
-msgid "Enter a list of values."
-msgstr "Inserire una lista di valori."
-
-780
+808
-msgid "Enter a valid IPv4 address."
-msgstr "Inserire un indirizzo IPv4 valido."
-
-2
+4
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
@@ -4049 +4056 @@
-msgstr "Scegliere un'opzione valida; '%(data)s' non presente in %(choices)s."
-
-45
+54
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Inserire un numero intero compreso tra -32.768 e 32.767 ."
-
-55
+64
-msgid "Enter a positive number."
-msgstr "Inserire un numero positivo."
-
-65
+74
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Inserire un numero intero compreso tra 0 e 32.767 ."
@@ -4291 +4298 @@
-msgstr "Dic."
-
-7
+8
-msgid "or"
-msgstr "o"
@@ -4345 +4352 @@
-msgstr ", %(number)d %(type)s"
-
-03
+12
-msgid "DATE_FORMAT"
-msgstr "j F Y"
-
-04
+13
-msgid "DATETIME_FORMAT"
-msgstr "j F Y, H:i"
-
-05
+14
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-21
+30
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y F"
-
-22
+31
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"

django/branches/newforms-admin/django/core/files/uploadedfile.py

@@ -194 +194 @@
-        Returns the full path of this file.
-        """
-
+_file.
-    
-    # Most methods on this object get proxied to NamedTemporaryFile.

django/branches/newforms-admin/django/core/management/commands/syncdb.py

@@ -42 +42 @@
-                # can do this is to check the text of the exception. Note that
-                # we're a bit broad in how we check the text, because different
-
-
+
+
+
-                msg = exc.args[0]
- management
+
-                    raise
-
@@ -106 +107 @@
-        # to do at this point.
-        emit_post_sync_signal(created_models, verbosity, interactive)
-
+
+
+
+
-        # Install custom SQL for the app (but only if this
-        # is a model we've just created)
@@ -145 +149 @@
-                                cursor.execute(sql)
-                        except Exception, e:
-
+\n
-                                                (app_name, model._meta.object_name, e))
-                            transaction.rollback_unless_managed()

django/branches/newforms-admin/django/core/management/__init__.py

@@ -135 +135 @@
-    def error(self, msg):
-        pass
+    
+    def _process_args(self, largs, rargs, values):
+        """
+        Overrides OptionParser._process_args to exclusively handle default
+        options and ignore args and other options. 
+        
+        This overrides the behavior of the super class, which stop parsing 
+        at the first unrecognized option.
+        """
+        while rargs:
+            arg = rargs[0]
+            try:
+                if arg[0:2] == "--" and len(arg) > 2:
+                    # process a single long option (possibly with value(s))
+                    # the superclass code pops the arg off rargs
+                    self._process_long_opt(rargs, values)
+                elif arg[:1] == "-" and len(arg) > 1:
+                    # process a cluster of short options (possibly with
+                    # value(s) for the last one only)
+                    # the superclass code pops the arg off rargs
+                    self._process_short_opts(rargs, values)
+                else:
+                    # it's either a non-default option or an arg
+                    # either way, add it to the args list so we can keep
+                    # dealing with options
+                    del rargs[0]
+                    raise error
+            except:
+                largs.append(arg)
-
-class ManagementUtility(object):

django/branches/newforms-admin/django/db/models/fields/__init__.py

@@ -315 +315 @@
-        if self.unique_for_year:
-            params['validator_list'].append(getattr(manipulator, 'isUnique%sFor%s' % (self.name, self.unique_for_year)))
-or (self.primary_key and not rel)
+and not rel
-            params['validator_list'].append(curry(manipulator_validator_unique, self, opts, manipulator))
-
@@ -540 +540 @@
-
-    def get_db_prep_lookup(self, lookup_type, value):
-== 'range'
+in ('range', 'in')
-            value = [smart_unicode(v) for v in value]
-        elif lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte') and hasattr(value, 'strftime'):
@@ -627 +627 @@
-
-    def get_db_prep_lookup(self, lookup_type, value):
-== 'range'
+in ('range', 'in')
-            value = [smart_unicode(v) for v in value]
-        else:
@@ -706 +706 @@
-
-    def get_db_prep_lookup(self, lookup_type, value):
-== 'range'
+in ('range', 'in')
-            value = [self._format(v) for v in value]
-        else:
@@ -821 +821 @@
-        upload_field_name = self.get_manipulator_field_names('')[0]
-        if new_data.get(upload_field_name, False):
-            func = getattr(new_object, 'save_%s_file' % self.name)
-            if rel:
-                file = new_data[upload_field_name][0]
-            else:
-                file = new_data[upload_field_name]
+
+            if not file:
+                return
-
-            # Backwards-compatible support for files-as-dictionaries.
@@ -835 +837 @@
-                file_name = file['filename']
-
+            func = getattr(new_object, 'save_%s_file' % self.name)
-            func(file_name, file, save)
-
@@ -1087 +1090 @@
-        else:
-            prep = smart_unicode
-== 'range'
+in ('range', 'in')
-            value = [prep(v) for v in value]
-        else:

django/branches/newforms-admin/django/db/models/query.py

@@ -1 +1 @@
-import warnings
-
-
+
+
+
+
+
-from django.db import connection, transaction, IntegrityError
-, FieldDoesNotExist
+
-from django.db.models.query_utils import Q, select_related_descend
-from django.db.models import signals, sql
@@ -9 +12 @@
-from django.utils.datastructures import SortedDict
-
+
-# Used to control how many objects are worked with at once in some cases (e.g.
-# when deleting objects).
@@ -17 +21 @@
-EmptyResultSet = sql.EmptyResultSet
-
+
-class CyclicDependency(Exception):
+    """
+    An error when dealing with a collection of objects that have a cyclic
+    dependency, i.e. when deleting multiple objects.
+    """
-    pass
-

django/branches/newforms-admin/django/db/models/sql/query.py

@@ -284 +284 @@
-            result.append('ORDER BY %s' % ', '.join(ordering))
-
-        #