Changeset 6656

Timestamp:

11/06/07 16:25:59 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Merged to [6652]

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/django/conf/locale/es/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/newforms-admin/django/conf/locale/es/LC_MESSAGES/django.po (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/auth/forms.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/sessions/middleware.py (modified) (3 diffs)
• django/branches/newforms-admin/django/core/management/commands/startapp.py (modified) (2 diffs)
• django/branches/newforms-admin/django/core/management/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/core/management/sql.py (modified) (5 diffs)
• django/branches/newforms-admin/django/core/servers/basehttp.py (modified) (2 diffs)
• django/branches/newforms-admin/django/db/backends/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/backends/mysql/base.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/fields/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/fields/subclassing.py (copied) (copied from django/trunk/django/db/models/fields/subclassing.py)
• django/branches/newforms-admin/django/db/models/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/middleware/http.py (modified) (3 diffs)
• django/branches/newforms-admin/django/newforms/fields.py (modified) (38 diffs)
• django/branches/newforms-admin/django/newforms/models.py (modified) (11 diffs)
• django/branches/newforms-admin/django/newforms/util.py (modified) (2 diffs)
• django/branches/newforms-admin/django/template/defaultfilters.py (modified) (38 diffs)
• django/branches/newforms-admin/django/template/defaulttags.py (modified) (46 diffs)
• django/branches/newforms-admin/django/test/testcases.py (modified) (1 diff)
• django/branches/newforms-admin/django/utils/cache.py (modified) (9 diffs)
• django/branches/newforms-admin/django/utils/dateformat.py (modified) (1 diff)
• django/branches/newforms-admin/django/utils/encoding.py (modified) (2 diffs)
• django/branches/newforms-admin/django/utils/http.py (modified) (2 diffs)
• django/branches/newforms-admin/django/views/static.py (modified) (3 diffs)
• django/branches/newforms-admin/docs/cache.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/custom_model_fields.txt (copied) (copied from django/trunk/docs/custom_model_fields.txt)
• django/branches/newforms-admin/docs/email.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/form_preview.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/model-api.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/modpython.txt (modified) (1 diff)
• django/branches/newforms-admin/docs/newforms.txt (modified) (17 diffs)
• django/branches/newforms-admin/docs/serialization.txt (modified) (4 diffs)
• django/branches/newforms-admin/docs/templates.txt (modified) (2 diffs)
• django/branches/newforms-admin/docs/testing.txt (modified) (1 diff)
• django/branches/newforms-admin/tests/modeltests/field_subclassing (copied) (copied from django/trunk/tests/modeltests/field_subclassing)
• django/branches/newforms-admin/tests/modeltests/field_subclassing/__init__.py (copied) (copied from django/trunk/tests/modeltests/field_subclassing/__init__.py)
• django/branches/newforms-admin/tests/modeltests/field_subclassing/models.py (copied) (copied from django/trunk/tests/modeltests/field_subclassing/models.py)
• django/branches/newforms-admin/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/forms/error_messages.py (copied) (copied from django/trunk/tests/regressiontests/forms/error_messages.py)
• django/branches/newforms-admin/tests/regressiontests/forms/extra.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/forms/regressions.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/forms/tests.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/forms/util.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/templates/urls.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/text/tests.py (modified) (1 diff)

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

@@ -1017 +1017 @@
-#: contrib/admin/views/main.py:780
-msgid "Database error"
-or
+ro
-
-#: contrib/auth/forms.py:17

django/branches/newforms-admin/django/contrib/auth/forms.py

@@ -105 +105 @@
-                'user': user,
-                }
-'Password reset on %s'
+_('Password reset on %s')
-
-class PasswordChangeForm(oldforms.Manipulator):

django/branches/newforms-admin/django/contrib/sessions/middleware.py

@@ +1 @@
+import time
+
-from django.conf import settings
-from django.utils.cache import patch_vary_headers
-
-
-
+
-
-TEST_COOKIE_NAME = 'testcookie'
@@ -11 +11 @@
-
-    def process_request(self, request):
-
-
+
+
+
-
-    def process_response(self, request, response):
@@ -31 +32 @@
-                else:
-                    max_age = settings.SESSION_COOKIE_AGE
-
-
-
-
-
-
-
+
+
-                # Save the seesion data and refresh the client cookie.
-                request.session.save()

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

@@ -1 @@
-from django.core.management.base import copy_helper, CommandError, LabelCommand
-import os
-
+from django.core.management.base import copy_helper, CommandError, LabelCommand
+
-class Command(LabelCommand):
-
+
+
-    args = "[appname]"
-    label = 'application name'
@@ -15 +17 @@
-        if directory is None:
-            directory = os.getcwd()
-
-
-
-
+
+
+
-        project_name = os.path.basename(directory)
-        if app_name == project_name:
-
-
+
+
+
-
-class ProjectCommand(Command):
-
+
+
-
-    def __init__(self, project_directory):

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

@@ -243 +243 @@
-    Configures the runtime environment. This can also be used by external
-    scripts wanting to set up a similar environment to manage.py.
+    Returns the project directory (assuming the passed settings module is
+    directly in the project directory).
-    """
-    # Add this project to sys.path so that it's importable in the conventional

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

@@ -253 +253 @@
-    pending_references = {}
-    qn = connection.ops.quote_name
+    inline_references = connection.features.inline_fk_references
-    for f in opts.fields:
-        col_type = f.db_type()
@@ -273 +274 @@
-            field_output.append(connection.ops.tablespace_sql(tablespace, inline=True))
-        if f.rel:
-
+inline_references and 
-                field_output.append(style.SQL_KEYWORD('REFERENCES') + ' ' + \
-                    style.SQL_TABLE(qn(f.rel.to._meta.db_table)) + ' (' + \
@@ -342 +343 @@
-    from django.db import connection, models
-    from django.contrib.contenttypes import generic
+    from django.db.backends.util import truncate_name
-
-    opts = model._meta
-    final_output = []
-    qn = connection.ops.quote_name
+    inline_references = connection.features.inline_fk_references
-    for f in opts.many_to_many:
-        if not isinstance(f.rel, generic.GenericRel):
@@ -355 +358 @@
-            table_output = [style.SQL_KEYWORD('CREATE TABLE') + ' ' + \
-                style.SQL_TABLE(qn(f.m2m_db_table())) + ' (']
- \
+
-                (style.SQL_FIELD(qn('id')),
-                style.SQL_COLTYPE(models.AutoField(primary_key=True).db_type()),
-                style.SQL_KEYWORD('NOT NULL PRIMARY KEY'),
-                tablespace_sql))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                (style.SQL_KEYWORD('UNIQUE'),
-                style.SQL_FIELD(qn(f.m2m_column_name())),
@@ -385 +405 @@
-            table_output.append(';')
-            final_output.append('\n'.join(table_output))
+
+            for r_table, r_col, table, col in deferred:
+                r_name = '%s_refs_%s_%x' % (r_col, col,
+                        abs(hash((r_table, table))))
+                final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % 
+                (qn(r_table),
+                truncate_name(r_name, connection.ops.max_name_length()),
+                qn(r_col), qn(table), qn(col),
+                connection.ops.deferrable_sql()))
-
-            # Add any extra SQL needed to support auto-incrementing PKs

django/branches/newforms-admin/django/core/servers/basehttp.py

@@ -10 +10 @@
-from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
-from types import ListType, StringType
-from email.Utils import formatdate
-import mimetypes
-import os
-import re
-import sys
-import time
-import urllib
+
+from django.utils.http import http_date
-
-__version__ = "0.1"
@@ -377 +377 @@
-                if 'Date' not in self.headers:
-                    self._write(
-(formatdate()[:26] + "GMT"
+http_date(
-                    )
-                if self.server_software and 'Server' not in self.headers:

django/branches/newforms-admin/django/db/backends/__init__.py

@@ -44 +44 @@
-    allows_unique_and_pk = True
-    autoindexes_primary_keys = True
+    inline_fk_references = True
-    needs_datetime_string_cast = True
-    needs_upper_for_iops = False

django/branches/newforms-admin/django/db/backends/mysql/base.py

@@ -62 +62 @@
-class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
+    inline_fk_references = False
-
-class DatabaseOperations(BaseDatabaseOperations):

django/branches/newforms-admin/django/db/backends/mysql_old/base.py

@@ -66 +66 @@
-class DatabaseFeatures(BaseDatabaseFeatures):
-    autoindexes_primary_keys = False
+    inline_fk_references = False
-
-class DatabaseOperations(BaseDatabaseOperations):

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

@@ -146 +146 @@
-        data_types = get_creation_module().DATA_TYPES
-        internal_type = self.get_internal_type()
+        if internal_type not in data_types:
+            return None
-        return data_types[internal_type] % self.__dict__
-

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

@@ -8 +8 @@
-from django.db.models.base import Model
-from django.db.models.fields import *
+from django.db.models.fields.subclassing import SubfieldBase
-from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED
-from django.db.models import signals

django/branches/newforms-admin/django/middleware/http.py

@@ -1 @@
-email.Utils import format
+django.utils.http import http_
-
-class ConditionalGetMiddleware(object):
@@ -12 +12 @@
-    """
-    def process_response(self, request, response):
-formatdate()[:26] + "GMT"
+http_date()
-        if not response.has_header('Content-Length'):
-            response['Content-Length'] = str(len(response.content))
@@ -24 +24 @@
-
-        if response.has_header('Last-Modified'):
-            last_mod = response['Last-Modified']
-            if_modified_since = request.META.get('HTTP_IF_MODIFIED_SINCE', None)
-            if if_modified_since == response['Last-Modified']:

django/branches/newforms-admin/django/newforms/fields.py

@@ -1 +1 @@
-"""
-
+.
-"""
-
@@ -7 +7 @@
-import re
-import time
-
-
-
-
-
-
-
+
-try:
-    from decimal import Decimal, DecimalException
-except ImportError:
-    from django.utils._decimal import Decimal, DecimalException
+try:
+    set
+except NameError:
+    from sets import Set as set
+
+from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import StrAndUnicode, smart_unicode
+
+from util import ErrorList, ValidationError
+from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput
+
-
-__all__ = (
@@ -24 +29 @@
-    'DEFAULT_TIME_INPUT_FORMATS', 'TimeField',
-    'DEFAULT_DATETIME_INPUT_FORMATS', 'DateTimeField',
- 'BooleanField',
-ChoiceField', 'NullBoolean
+
+BooleanField', 'NullBooleanField', 'Choice
-    'ComboField', 'MultiValueField', 'FloatField', 'DecimalField',
-    'SplitDateTimeField', 'IPAddressField',
@@ -33 +38 @@
-EMPTY_VALUES = (None, '')
-
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
-
-try:
-    from decimal import Decimal
-except ImportError:
-    from django.utils._decimal import Decimal   # Python 2.3 fallback
-
-class Field(object):
-    widget = TextInput # Default widget to use when rendering this type of Field.
-    hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden".
+    default_error_messages = {
+        'required': _(u'This field is required.'),
+        'invalid': _(u'Enter a valid value.'),
+    }
-
-    # Tracks each time a Field instance is created. Used to retain order.
-    creation_counter = 0
-
-
+
+
-        # required -- Boolean that specifies whether the field is required.
-        #             True by default.
@@ -83 +84 @@
-        Field.creation_counter += 1
-
+        self.error_messages = self._build_error_messages(error_messages)
+
+    def _build_error_messages(self, extra_error_messages):
+        error_messages = {}
+
+        def get_default_error_messages(klass):
+            for base_class in klass.__bases__:
+                get_default_error_messages(base_class)
+            if hasattr(klass, 'default_error_messages'):
+                error_messages.update(klass.default_error_messages)
+
+        get_default_error_messages(self.__class__)
+        if extra_error_messages:
+            error_messages.update(extra_error_messages)
+        return error_messages
+
-    def clean(self, value):
-        """
@@ -91 +108 @@
-        """
-        if self.required and value in EMPTY_VALUES:
-ugettext(u'This field is required.')
+self.error_messages['required']
-        return value
-
@@ -109 +126 @@
-
-class CharField(Field):
+    default_error_messages = {
+        'max_length': _(u'Ensure this value has at most %(max)d characters (it has %(length)d).'),
+        'min_length': _(u'Ensure this value has at least %(min)d characters (it has %(length)d).'),
+    }
+
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        self.max_length, self.min_length = max_length, min_length
@@ -121 +143 @@
-        value_length = len(value)
-        if self.max_length is not None and value_length > self.max_length:
-ugettext(u'Ensure this value has at most %(max)d characters (it has %(length)d).')
+self.error_messages['max_length']
-        if self.min_length is not None and value_length < self.min_length:
-ugettext(u'Ensure this value has at least %(min)d characters (it has %(length)d).')
+self.error_messages['min_length']
-        return value
-
@@ -132 +154 @@
-
-class IntegerField(Field):
+    default_error_messages = {
+        'invalid': _(u'Enter a whole number.'),
+        'max_value': _(u'Ensure this value is less than or equal to %s.'),
+        'min_value': _(u'Ensure this value is greater than or equal to %s.'),
+    }
+
-    def __init__(self, max_value=None, min_value=None, *args, **kwargs):
-        self.max_value, self.min_value = max_value, min_value
@@ -147 +175 @@
-            value = int(str(value))
-        except (ValueError, TypeError):
-ugettext(u'Enter a whole number.')
+self.error_messages['invalid']
-        if self.max_value is not None and value > self.max_value:
-ugettext(u'Ensure this value is less than or equal to %s.')
+self.error_messages['max_value']
-        if self.min_value is not None and value < self.min_value:
-ugettext(u'Ensure this value is greater than or equal to %s.')
+self.error_messages['min_value']
-        return value
-
-class FloatField(Field):
+    default_error_messages = {
+        'invalid': _(u'Enter a number.'),
+        'max_value': _(u'Ensure this value is less than or equal to %s.'),
+        'min_value': _(u'Ensure this value is greater than or equal to %s.'),
+    }
+
-    def __init__(self, max_value=None, min_value=None, *args, **kwargs):
-        self.max_value, self.min_value = max_value, min_value
@@ -170 +204 @@
-            value = float(value)
-        except (ValueError, TypeError):
-ugettext('Enter a number.')
+self.error_messages['invalid']
-        if self.max_value is not None and value > self.max_value:
-ugettext('Ensure this value is less than or equal to %s.')
+self.error_messages['max_value']
-        if self.min_value is not None and value < self.min_value:
-ugettext('Ensure this value is greater than or equal to %s.')
+self.error_messages['min_value']
-        return value
-
-class DecimalField(Field):
+    default_error_messages = {
+        'invalid': _(u'Enter a number.'),
+        'max_value': _(u'Ensure this value is less than or equal to %s.'),
+        'min_value': _(u'Ensure this value is greater than or equal to %s.'),
+        'max_digits': _('Ensure that there are no more than %s digits in total.'),
+        'max_decimal_places': _('Ensure that there are no more than %s decimal places.'),
+        'max_whole_digits': _('Ensure that there are no more than %s digits before the decimal point.')
+    }
+
-    def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_places=None, *args, **kwargs):
-        self.max_value, self.min_value = max_value, min_value
@@ -197 +240 @@
-            value = Decimal(value)
-        except DecimalException:
-ugettext('Enter a number.')
+self.error_messages['invalid']
-        pieces = str(value).lstrip("-").split('.')
-        decimals = (len(pieces) == 2) and len(pieces[1]) or 0
-        digits = len(pieces[0])
-        if self.max_value is not None and value > self.max_value:
-ugettext('Ensure this value is less than or equal to %s.')
+self.error_messages['max_value']
-        if self.min_value is not None and value < self.min_value:
-ugettext('Ensure this value is greater than or equal to %s.')
+self.error_messages['min_value']
-        if self.max_digits is not None and (digits + decimals) > self.max_digits:
-ugettext('Ensure that there are no more than %s digits in total.')
+self.error_messages['max_digits']
-        if self.decimal_places is not None and decimals > self.decimal_places:
-ugettext('Ensure that there are no more than %s decimal places.')
+self.error_messages['max_decimal_places']
-        if self.max_digits is not None and self.decimal_places is not None and digits > (self.max_digits - self.decimal_places):
-ugettext('Ensure that there are no more than %s digits before the decimal point.')
+self.error_messages['max_whole_digits']
-        return value
-
@@ -222 +265 @@
-
-class DateField(Field):
+    default_error_messages = {
+        'invalid': _(u'Enter a valid date.'),
+    }
+
-    def __init__(self, input_formats=None, *args, **kwargs):
-        super(DateField, self).__init__(*args, **kwargs)
@@ -243 +290 @@
-            except ValueError:
-                continue
-ugettext(u'Enter a valid date.')
+self.error_messages['invalid']
-
-DEFAULT_TIME_INPUT_FORMATS = (
@@ -251 +298 @@
-
-class TimeField(Field):
+    default_error_messages = {
+        'invalid': _(u'Enter a valid time.')
+    }
+
-    def __init__(self, input_formats=None, *args, **kwargs):
-        super(TimeField, self).__init__(*args, **kwargs)
@@ -270 +321 @@
-            except ValueError:
-                continue
-ugettext(u'Enter a valid time.')
+self.error_messages['invalid']
-
-DEFAULT_DATETIME_INPUT_FORMATS = (
@@ -286 +337 @@
-class DateTimeField(Field):
-    widget = DateTimeInput
+    default_error_messages = {
+        'invalid': _(u'Enter a valid date/time.'),
+    }
-
-    def __init__(self, input_formats=None, *args, **kwargs):
@@ -307 +361 @@
-            # components: date and time.
-            if len(value) != 2:
-ugettext(u'Enter a valid date/time.')
+self.error_messages['invalid']
-            value = '%s %s' % tuple(value)
-        for format in self.input_formats:
@@ -314 +368 @@
-            except ValueError:
-                continue
-ugettext(u'Enter a valid date/time.')
+self.error_messages['invalid']
-
-class RegexField(CharField):
@@ -323 +377 @@
-        'Enter a valid value' is too generic for you.
-        """
+        # error_message is just kept for backwards compatibility:
+        if error_message:
+            error_messages = kwargs.get('error_messages') or {}
+            error_messages['invalid'] = error_message
+            kwargs['error_messages'] = error_messages
-        super(RegexField, self).__init__(max_length, min_length, *args, **kwargs)
-        if isinstance(regex, basestring):
-            regex = re.compile(regex)
-        self.regex = regex
-        self.error_message = error_message or ugettext(u'Enter a valid value.')
-
-    def clean(self, value):
@@ -338 +396 @@
-            return value
-        if not self.regex.search(value):
-
+s['invalid']
-        return value
-
@@ -347 +405 @@
-
-class EmailField(RegexField):
+    default_error_messages = {
+        'invalid': _(u'Enter a valid e-mail address.'),
+    }
+
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-
-ugettext(u'Enter a valid e-mail address.'), *args,
+ *args,
+               
-
-try:
@@ -373 +435 @@
-class FileField(Field):
-    widget = FileInput
+    default_error_messages = {
+        'invalid': _(u"No file was submitted. Check the encoding type on the form."),
+        'missing': _(u"No file was submitted."),
+        'empty': _(u"The submitted file is empty."),
+    }
+
-    def __init__(self, *args, **kwargs):
-        super(FileField, self).__init__(*args, **kwargs)
@@ -383 +451 @@
-            f = UploadedFile(data['filename'], data['content'])
-        except TypeError:
-ugettext(u"No file was submitted. Check the encoding type on the form.")
+self.error_messages['invalid']
-        except KeyError:
-ugettext(u"No file was submitted.")
+self.error_messages['missing']
-        if not f.content:
-ugettext(u"The submitted file is empty.")
+self.error_messages['empty']
-        return f
-
-class ImageField(FileField):
+    default_error_messages = {
+        'invalid_image': _(u"Upload a valid image. The file you uploaded was either not an image or a corrupted image."),
+    }
+
-    def clean(self, data):
-        """
@@ -411 +483 @@
-            trial_image.verify()
-        except Exception: # Python Imaging Library doesn't recognize it as an image
-ugettext(u"Upload a valid image. The file you uploaded was either not an image or a corrupted image.")
+self.error_messages['invalid_image']
-        return f
-
@@ -423 +495 @@
-
-class URLField(RegexField):
+    default_error_messages = {
+        'invalid': _(u'Enter a valid URL.'),
+        'invalid_link': _(u'This URL appears to be a broken link.'),
+    }
+
-    def __init__(self, max_length=None, min_length=None, verify_exists=False,
-            validator_user_agent=URL_VALIDATOR_USER_AGENT, *args, **kwargs):
-
+
+
-        self.verify_exists = verify_exists
-        self.user_agent = validator_user_agent
@@ -450 +528 @@
-                u = urllib2.urlopen(req)
-            except ValueError:
-ugettext(u'Enter a valid URL.')
+self.error_messages['invalid']
-            except: # urllib2.URLError, httplib.InvalidURL, etc.
-ugettext(u'This URL appears to be a broken link.')
+self.error_messages['invalid_link']
-        return value
-
@@ -479 +557 @@
-class ChoiceField(Field):
-    widget = Select
-
-
-
+
+
+
+
+
+
+
+
-        self.choices = choices
-
@@ -507 +590 @@
-        valid_values = set([smart_unicode(k) for k, v in self.choices])
-        if value not in valid_values:
-ugettext(u'Select a valid choice. That choice is not one of the available choices.')
+self.error_messages['invalid_choice'] % {'value': value}
-        return value
-