Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
import copy
|
2007-09-08 13:11:17 +08:00
|
|
|
import datetime
|
|
|
|
import os
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
import re
|
2007-09-08 13:11:17 +08:00
|
|
|
import time
|
|
|
|
try:
|
|
|
|
import decimal
|
|
|
|
except ImportError:
|
|
|
|
from django.utils import _decimal as decimal # for Python 2.3
|
|
|
|
|
2008-08-11 20:11:25 +08:00
|
|
|
from django.db import connection
|
2006-05-02 09:31:56 +08:00
|
|
|
from django.db.models import signals
|
2008-04-28 15:07:17 +08:00
|
|
|
from django.db.models.query_utils import QueryWrapper
|
2008-08-09 04:59:02 +08:00
|
|
|
from django.dispatch import dispatcher
|
2005-08-02 05:29:52 +08:00
|
|
|
from django.conf import settings
|
2008-07-19 09:22:26 +08:00
|
|
|
from django import forms
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
from django.core import exceptions
|
2008-06-26 11:11:32 +08:00
|
|
|
from django.utils.datastructures import DictWrapper
|
2006-07-22 04:39:17 +08:00
|
|
|
from django.utils.functional import curry
|
2006-09-26 14:33:32 +08:00
|
|
|
from django.utils.itercompat import tee
|
2005-08-02 05:29:52 +08:00
|
|
|
from django.utils.text import capfirst
|
Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.
Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 20:11:04 +08:00
|
|
|
from django.utils.translation import ugettext_lazy, ugettext as _
|
2007-07-06 18:21:14 +08:00
|
|
|
from django.utils.encoding import smart_unicode, force_unicode, smart_str
|
2008-07-18 11:47:27 +08:00
|
|
|
from django.utils import datetime_safe
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2006-03-01 11:51:55 +08:00
|
|
|
class NOT_PROVIDED:
|
|
|
|
pass
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
# The values to use for "blank" in SelectFields. Will be appended to the start of most "choices" lists.
|
|
|
|
BLANK_CHOICE_DASH = [("", "---------")]
|
|
|
|
BLANK_CHOICE_NONE = [("", "None")]
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
class FieldDoesNotExist(Exception):
|
|
|
|
pass
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2005-11-10 07:37:41 +08:00
|
|
|
# A guide to Field parameters:
|
|
|
|
#
|
2006-05-02 09:31:56 +08:00
|
|
|
# * name: The name of the field specifed in the model.
|
2005-11-10 07:37:41 +08:00
|
|
|
# * attname: The attribute to use on the model object. This is the same as
|
|
|
|
# "name", except in the case of ForeignKeys, where "_id" is
|
|
|
|
# appended.
|
|
|
|
# * db_column: The db_column specified in the model (or None).
|
|
|
|
# * column: The database column for this field. This is the same as
|
|
|
|
# "attname", except if db_column is specified.
|
|
|
|
#
|
|
|
|
# Code that introspects values, or does other dynamic things, should use
|
|
|
|
# attname. For example, this gets the primary key value of object "obj":
|
|
|
|
#
|
|
|
|
# getattr(obj, opts.pk.attname)
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class Field(object):
|
|
|
|
# Designates whether empty strings fundamentally are allowed at the
|
|
|
|
# database level.
|
|
|
|
empty_strings_allowed = True
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
# These track each time a Field instance is created. Used to retain order.
|
|
|
|
# The auto_creation_counter is used for fields that Django implicitly
|
|
|
|
# creates, creation_counter is used for all user-specified fields.
|
2005-08-26 06:51:30 +08:00
|
|
|
creation_counter = 0
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
auto_creation_counter = -1
|
2005-08-26 06:51:30 +08:00
|
|
|
|
|
|
|
def __init__(self, verbose_name=None, name=None, primary_key=False,
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
max_length=None, unique=False, blank=False, null=False,
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
db_index=False, rel=None, default=NOT_PROVIDED, editable=True,
|
|
|
|
serialize=True, unique_for_date=None, unique_for_month=None,
|
|
|
|
unique_for_year=None, choices=None, help_text='', db_column=None,
|
|
|
|
db_tablespace=None, auto_created=False):
|
2005-08-02 05:29:52 +08:00
|
|
|
self.name = name
|
2006-05-02 09:31:56 +08:00
|
|
|
self.verbose_name = verbose_name
|
2005-08-02 05:29:52 +08:00
|
|
|
self.primary_key = primary_key
|
2008-06-30 12:46:59 +08:00
|
|
|
self.max_length, self._unique = max_length, unique
|
2005-08-02 05:29:52 +08:00
|
|
|
self.blank, self.null = blank, null
|
2007-06-23 22:16:00 +08:00
|
|
|
# Oracle treats the empty string ('') as null, so coerce the null
|
|
|
|
# option whenever '' is a possible value.
|
2008-06-16 11:15:04 +08:00
|
|
|
if self.empty_strings_allowed and connection.features.interprets_empty_strings_as_nulls:
|
2007-06-23 22:16:00 +08:00
|
|
|
self.null = True
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
self.rel = rel
|
|
|
|
self.default = default
|
2005-08-02 05:29:52 +08:00
|
|
|
self.editable = editable
|
2007-03-19 19:57:53 +08:00
|
|
|
self.serialize = serialize
|
2005-08-02 05:29:52 +08:00
|
|
|
self.unique_for_date, self.unique_for_month = unique_for_date, unique_for_month
|
|
|
|
self.unique_for_year = unique_for_year
|
2006-09-26 14:33:32 +08:00
|
|
|
self._choices = choices or []
|
2005-08-02 05:29:52 +08:00
|
|
|
self.help_text = help_text
|
2005-08-26 06:51:30 +08:00
|
|
|
self.db_column = db_column
|
2007-12-02 03:23:49 +08:00
|
|
|
self.db_tablespace = db_tablespace or settings.DEFAULT_INDEX_TABLESPACE
|
2008-08-25 11:51:25 +08:00
|
|
|
self.auto_created = auto_created
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
# Set db_index to True if the field has a relationship and doesn't explicitly set db_index.
|
2006-05-02 09:31:56 +08:00
|
|
|
self.db_index = db_index
|
2005-08-02 05:29:52 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
# Adjust the appropriate creation counter, and save our local copy.
|
|
|
|
if auto_created:
|
|
|
|
self.creation_counter = Field.auto_creation_counter
|
|
|
|
Field.auto_creation_counter -= 1
|
|
|
|
else:
|
|
|
|
self.creation_counter = Field.creation_counter
|
|
|
|
Field.creation_counter += 1
|
2005-08-26 06:51:30 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def __cmp__(self, other):
|
|
|
|
# This is needed because bisect does not take a comparison function.
|
|
|
|
return cmp(self.creation_counter, other.creation_counter)
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def __deepcopy__(self, memodict):
|
|
|
|
# We don't have to deepcopy very much here, since most things are not
|
|
|
|
# intended to be altered after initial creation.
|
|
|
|
obj = copy.copy(self)
|
|
|
|
if self.rel:
|
|
|
|
obj.rel = copy.copy(self.rel)
|
|
|
|
memodict[id(self)] = obj
|
|
|
|
return obj
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
"""
|
|
|
|
Converts the input value into the expected Python data type, raising
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
django.core.exceptions.ValidationError if the data can't be converted.
|
|
|
|
Returns the converted value. Subclasses should override this.
|
2006-05-02 09:31:56 +08:00
|
|
|
"""
|
|
|
|
return value
|
|
|
|
|
2007-07-20 14:28:56 +08:00
|
|
|
def db_type(self):
|
|
|
|
"""
|
|
|
|
Returns the database column data type for this field, taking into
|
|
|
|
account the DATABASE_ENGINE setting.
|
|
|
|
"""
|
|
|
|
# The default implementation of this method looks at the
|
|
|
|
# backend-specific DATA_TYPES dictionary, looking up the field by its
|
|
|
|
# "internal type".
|
|
|
|
#
|
|
|
|
# A Field class can implement the get_internal_type() method to specify
|
|
|
|
# which *preexisting* Django Field class it's most similar to -- i.e.,
|
|
|
|
# an XMLField is represented by a TEXT column type, which is the same
|
|
|
|
# as the TextField Django field type, which means XMLField's
|
|
|
|
# get_internal_type() returns 'TextField'.
|
|
|
|
#
|
2008-08-11 20:11:25 +08:00
|
|
|
# But the limitation of the get_internal_type() / data_types approach
|
2007-07-20 14:28:56 +08:00
|
|
|
# is that it cannot handle database column types that aren't already
|
|
|
|
# mapped to one of the built-in Django field types. In this case, you
|
|
|
|
# can implement db_type() instead of get_internal_type() to specify
|
|
|
|
# exactly which wacky database column type you want to use.
|
2008-06-26 11:11:32 +08:00
|
|
|
data = DictWrapper(self.__dict__, connection.ops.quote_name, "qn_")
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
try:
|
2008-08-11 20:11:25 +08:00
|
|
|
return connection.creation.data_types[self.get_internal_type()] % data
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
except KeyError:
|
2007-11-05 21:59:42 +08:00
|
|
|
return None
|
2007-07-20 14:28:56 +08:00
|
|
|
|
2008-06-30 12:46:59 +08:00
|
|
|
def unique(self):
|
|
|
|
return self._unique or self.primary_key
|
|
|
|
unique = property(unique)
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def set_attributes_from_name(self, name):
|
|
|
|
self.name = name
|
2005-11-10 07:37:41 +08:00
|
|
|
self.attname, self.column = self.get_attname_column()
|
2008-07-28 08:45:04 +08:00
|
|
|
if self.verbose_name is None and name:
|
|
|
|
self.verbose_name = name.replace('_', ' ')
|
2006-05-02 09:31:56 +08:00
|
|
|
|
|
|
|
def contribute_to_class(self, cls, name):
|
|
|
|
self.set_attributes_from_name(name)
|
|
|
|
cls._meta.add_field(self)
|
|
|
|
if self.choices:
|
|
|
|
setattr(cls, 'get_%s_display' % self.name, curry(cls._get_FIELD_display, field=self))
|
2005-08-26 06:51:30 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def get_attname(self):
|
|
|
|
return self.name
|
|
|
|
|
2005-11-10 07:37:41 +08:00
|
|
|
def get_attname_column(self):
|
2006-05-02 09:31:56 +08:00
|
|
|
attname = self.get_attname()
|
2005-11-10 07:37:41 +08:00
|
|
|
column = self.db_column or attname
|
|
|
|
return attname, column
|
2005-08-26 06:51:30 +08:00
|
|
|
|
|
|
|
def get_cache_name(self):
|
|
|
|
return '_%s_cache' % self.name
|
|
|
|
|
2005-09-29 07:08:47 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return self.__class__.__name__
|
|
|
|
|
2006-05-30 01:08:58 +08:00
|
|
|
def pre_save(self, model_instance, add):
|
2005-08-10 13:08:27 +08:00
|
|
|
"Returns field's value just before saving."
|
2006-05-30 01:08:58 +08:00
|
|
|
return getattr(model_instance, self.attname)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
"""Returns field's value prepared for interacting with the database
|
|
|
|
backend.
|
|
|
|
|
|
|
|
Used by the default implementations of ``get_db_prep_save``and
|
|
|
|
`get_db_prep_lookup```
|
|
|
|
"""
|
|
|
|
return value
|
|
|
|
|
2005-08-10 11:12:37 +08:00
|
|
|
def get_db_prep_save(self, value):
|
2005-08-02 05:29:52 +08:00
|
|
|
"Returns field's value prepared for saving into a database."
|
2008-07-29 13:09:29 +08:00
|
|
|
return self.get_db_prep_value(value)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
def get_db_prep_lookup(self, lookup_type, value):
|
|
|
|
"Returns field's value prepared for database lookup."
|
2008-04-28 15:07:17 +08:00
|
|
|
if hasattr(value, 'as_sql'):
|
|
|
|
sql, params = value.as_sql()
|
|
|
|
return QueryWrapper(('(%s)' % sql), params)
|
2008-07-29 13:09:29 +08:00
|
|
|
if lookup_type in ('regex', 'iregex', 'month', 'day', 'search'):
|
2005-08-02 05:29:52 +08:00
|
|
|
return [value]
|
2008-07-29 13:09:29 +08:00
|
|
|
elif lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte'):
|
|
|
|
return [self.get_db_prep_value(value)]
|
2005-08-02 05:29:52 +08:00
|
|
|
elif lookup_type in ('range', 'in'):
|
2008-07-29 13:09:29 +08:00
|
|
|
return [self.get_db_prep_value(v) for v in value]
|
2005-12-05 02:54:44 +08:00
|
|
|
elif lookup_type in ('contains', 'icontains'):
|
2008-06-16 11:15:04 +08:00
|
|
|
return ["%%%s%%" % connection.ops.prep_for_like_query(value)]
|
2005-08-02 05:29:52 +08:00
|
|
|
elif lookup_type == 'iexact':
|
2008-08-28 13:42:05 +08:00
|
|
|
return [connection.ops.prep_for_iexact_query(value)]
|
2005-12-05 02:54:44 +08:00
|
|
|
elif lookup_type in ('startswith', 'istartswith'):
|
2008-06-16 11:15:04 +08:00
|
|
|
return ["%s%%" % connection.ops.prep_for_like_query(value)]
|
2005-12-05 02:54:44 +08:00
|
|
|
elif lookup_type in ('endswith', 'iendswith'):
|
2008-06-16 11:15:04 +08:00
|
|
|
return ["%%%s" % connection.ops.prep_for_like_query(value)]
|
2005-08-02 05:29:52 +08:00
|
|
|
elif lookup_type == 'isnull':
|
|
|
|
return []
|
2007-02-14 14:32:32 +08:00
|
|
|
elif lookup_type == 'year':
|
|
|
|
try:
|
|
|
|
value = int(value)
|
|
|
|
except ValueError:
|
|
|
|
raise ValueError("The __year lookup type requires an integer argument")
|
2008-07-29 13:09:29 +08:00
|
|
|
|
|
|
|
if self.get_internal_type() == 'DateField':
|
|
|
|
return connection.ops.year_lookup_bounds_for_date_field(value)
|
2008-02-23 16:36:41 +08:00
|
|
|
else:
|
2008-07-29 13:09:29 +08:00
|
|
|
return connection.ops.year_lookup_bounds(value)
|
|
|
|
|
2007-02-14 14:32:32 +08:00
|
|
|
raise TypeError("Field has invalid lookup: %s" % lookup_type)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
def has_default(self):
|
|
|
|
"Returns a boolean of whether this field has a default value."
|
2006-03-01 11:51:55 +08:00
|
|
|
return self.default is not NOT_PROVIDED
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
def get_default(self):
|
|
|
|
"Returns the default value for this field."
|
2006-03-01 11:51:55 +08:00
|
|
|
if self.default is not NOT_PROVIDED:
|
2006-05-02 09:31:56 +08:00
|
|
|
if callable(self.default):
|
|
|
|
return self.default()
|
2007-10-04 09:55:51 +08:00
|
|
|
return force_unicode(self.default, strings_only=True)
|
2008-06-16 11:15:04 +08:00
|
|
|
if not self.empty_strings_allowed or (self.null and not connection.features.interprets_empty_strings_as_nulls):
|
2005-08-02 05:29:52 +08:00
|
|
|
return None
|
|
|
|
return ""
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def get_validator_unique_lookup_type(self):
|
|
|
|
return '%s__exact' % self.name
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
|
2008-07-27 15:22:39 +08:00
|
|
|
"""Returns choices with a default blank choices included, for use
|
|
|
|
as SelectField choices for this field."""
|
2005-08-02 05:29:52 +08:00
|
|
|
first_choice = include_blank and blank_choice or []
|
|
|
|
if self.choices:
|
|
|
|
return first_choice + list(self.choices)
|
2006-05-02 09:31:56 +08:00
|
|
|
rel_model = self.rel.to
|
2006-08-01 22:20:01 +08:00
|
|
|
if hasattr(self.rel, 'get_related_field'):
|
Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.
Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 20:11:04 +08:00
|
|
|
lst = [(getattr(x, self.rel.get_related_field().attname), smart_unicode(x)) for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to)]
|
2006-08-01 22:20:01 +08:00
|
|
|
else:
|
Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.
Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 20:11:04 +08:00
|
|
|
lst = [(x._get_pk_val(), smart_unicode(x)) for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to)]
|
2006-08-01 22:20:01 +08:00
|
|
|
return first_choice + lst
|
2005-11-26 05:20:09 +08:00
|
|
|
|
|
|
|
def get_choices_default(self):
|
2008-07-19 07:54:34 +08:00
|
|
|
return self.get_choices()
|
2005-11-26 05:20:09 +08:00
|
|
|
|
2008-07-27 15:22:39 +08:00
|
|
|
def get_flatchoices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
|
|
|
|
"Returns flattened choices with a default blank choice included."
|
|
|
|
first_choice = include_blank and blank_choice or []
|
2008-07-30 05:43:07 +08:00
|
|
|
return first_choice + list(self.flatchoices)
|
2008-07-27 15:22:39 +08:00
|
|
|
|
2005-11-26 05:20:09 +08:00
|
|
|
def _get_val_from_obj(self, obj):
|
|
|
|
if obj:
|
2006-05-02 09:31:56 +08:00
|
|
|
return getattr(obj, self.attname)
|
2005-11-26 05:20:09 +08:00
|
|
|
else:
|
2006-05-02 09:31:56 +08:00
|
|
|
return self.get_default()
|
2005-11-26 05:20:09 +08:00
|
|
|
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
def value_to_string(self, obj):
|
2005-11-26 05:20:09 +08:00
|
|
|
"""
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
Returns a string value of this field from the passed obj.
|
|
|
|
This is used by the serialization framework.
|
2005-11-26 05:20:09 +08:00
|
|
|
"""
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
return smart_unicode(self._get_val_from_obj(obj))
|
2005-11-26 05:20:09 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def bind(self, fieldmapping, original, bound_field_class):
|
2005-11-26 05:20:09 +08:00
|
|
|
return bound_field_class(self, fieldmapping, original)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2006-09-26 14:33:32 +08:00
|
|
|
def _get_choices(self):
|
|
|
|
if hasattr(self._choices, 'next'):
|
|
|
|
choices, self._choices = tee(self._choices)
|
|
|
|
return choices
|
|
|
|
else:
|
|
|
|
return self._choices
|
|
|
|
choices = property(_get_choices)
|
|
|
|
|
2008-07-19 15:53:02 +08:00
|
|
|
def _get_flatchoices(self):
|
2008-07-27 15:22:39 +08:00
|
|
|
"""Flattened version of choices tuple."""
|
2008-07-19 15:53:02 +08:00
|
|
|
flat = []
|
2008-07-27 15:22:39 +08:00
|
|
|
for choice, value in self.choices:
|
2008-07-19 15:53:02 +08:00
|
|
|
if type(value) in (list, tuple):
|
|
|
|
flat.extend(value)
|
|
|
|
else:
|
|
|
|
flat.append((choice,value))
|
|
|
|
return flat
|
|
|
|
flatchoices = property(_get_flatchoices)
|
2008-07-27 15:22:39 +08:00
|
|
|
|
2007-08-06 21:58:56 +08:00
|
|
|
def save_form_data(self, instance, data):
|
|
|
|
setattr(instance, self.name, data)
|
2007-09-08 13:11:17 +08:00
|
|
|
|
2007-04-28 21:55:24 +08:00
|
|
|
def formfield(self, form_class=forms.CharField, **kwargs):
|
2008-07-19 09:22:26 +08:00
|
|
|
"Returns a django.forms.Field instance for this database Field."
|
2007-01-29 06:36:02 +08:00
|
|
|
defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
|
2007-04-28 22:18:03 +08:00
|
|
|
if self.choices:
|
2007-11-30 00:32:18 +08:00
|
|
|
defaults['widget'] = forms.Select(choices=self.get_choices(include_blank=self.blank or not (self.has_default() or 'initial' in kwargs)))
|
2007-10-20 21:01:40 +08:00
|
|
|
if self.has_default():
|
|
|
|
defaults['initial'] = self.get_default()
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return form_class(**defaults)
|
2006-12-15 13:46:11 +08:00
|
|
|
|
2006-12-28 10:27:14 +08:00
|
|
|
def value_from_object(self, obj):
|
|
|
|
"Returns the value of this field in the given model instance."
|
|
|
|
return getattr(obj, self.attname)
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class AutoField(Field):
|
|
|
|
empty_strings_allowed = False
|
2005-08-10 13:08:27 +08:00
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
assert kwargs.get('primary_key', False) is True, "%ss must have primary_key=True." % self.__class__.__name__
|
2006-05-02 09:31:56 +08:00
|
|
|
kwargs['blank'] = True
|
2005-08-10 13:08:27 +08:00
|
|
|
Field.__init__(self, *args, **kwargs)
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
if value is None:
|
|
|
|
return value
|
|
|
|
try:
|
|
|
|
return int(value)
|
|
|
|
except (TypeError, ValueError):
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_("This value must be an integer."))
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
if value is None:
|
|
|
|
return None
|
|
|
|
return int(value)
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def contribute_to_class(self, cls, name):
|
|
|
|
assert not cls._meta.has_auto_field, "A model can't have more than one AutoField."
|
|
|
|
super(AutoField, self).contribute_to_class(cls, name)
|
|
|
|
cls._meta.has_auto_field = True
|
2007-09-15 02:12:36 +08:00
|
|
|
cls._meta.auto_field = self
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2006-12-16 05:22:13 +08:00
|
|
|
return None
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class BooleanField(Field):
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
kwargs['blank'] = True
|
2008-07-22 12:49:32 +08:00
|
|
|
if 'default' not in kwargs and not kwargs.get('null'):
|
|
|
|
kwargs['default'] = False
|
2005-08-02 05:29:52 +08:00
|
|
|
Field.__init__(self, *args, **kwargs)
|
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "BooleanField"
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
if value in (True, False): return value
|
2006-09-26 08:36:04 +08:00
|
|
|
if value in ('t', 'True', '1'): return True
|
|
|
|
if value in ('f', 'False', '0'): return False
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_("This value must be either True or False."))
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2008-08-29 10:40:56 +08:00
|
|
|
def get_db_prep_lookup(self, lookup_type, value):
|
|
|
|
# Special-case handling for filters coming from a web request (e.g. the
|
|
|
|
# admin interface). Only works for scalar values (not lists). If you're
|
|
|
|
# passing in a list, you might as well make things the right type when
|
|
|
|
# constructing the list.
|
|
|
|
if value in ('1', '0'):
|
|
|
|
value = bool(int(value))
|
|
|
|
return super(BooleanField, self).get_db_prep_lookup(lookup_type, value)
|
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
if value is None:
|
|
|
|
return None
|
|
|
|
return bool(value)
|
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': forms.BooleanField}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(BooleanField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class CharField(Field):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "CharField"
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
if isinstance(value, basestring):
|
|
|
|
return value
|
|
|
|
if value is None:
|
|
|
|
if self.null:
|
|
|
|
return value
|
|
|
|
else:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
ugettext_lazy("This field cannot be null."))
|
Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.
Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 20:11:04 +08:00
|
|
|
return smart_unicode(value)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-08-05 13:14:46 +08:00
|
|
|
defaults = {'max_length': self.max_length}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(CharField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
# TODO: Maybe move this into contrib, because it's specialized.
|
2005-08-02 05:29:52 +08:00
|
|
|
class CommaSeparatedIntegerField(CharField):
|
2008-08-29 04:58:10 +08:00
|
|
|
def formfield(self, **kwargs):
|
|
|
|
defaults = {
|
|
|
|
'form_class': forms.RegexField,
|
|
|
|
'regex': '^[\d,]+$',
|
|
|
|
'max_length': self.max_length,
|
|
|
|
'error_messages': {
|
|
|
|
'invalid': _(u'Enter only digits separated by commas.'),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(CommaSeparatedIntegerField, self).formfield(**defaults)
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
|
|
|
|
ansi_date_re = re.compile(r'^\d{4}-\d{1,2}-\d{1,2}$')
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
class DateField(Field):
|
|
|
|
empty_strings_allowed = False
|
2005-08-26 06:51:30 +08:00
|
|
|
def __init__(self, verbose_name=None, name=None, auto_now=False, auto_now_add=False, **kwargs):
|
2005-08-02 05:29:52 +08:00
|
|
|
self.auto_now, self.auto_now_add = auto_now, auto_now_add
|
2006-05-02 09:31:56 +08:00
|
|
|
#HACKs : auto_now_add/auto_now should be done as a default or a pre_save.
|
2005-08-02 05:29:52 +08:00
|
|
|
if auto_now or auto_now_add:
|
|
|
|
kwargs['editable'] = False
|
2005-11-26 05:20:09 +08:00
|
|
|
kwargs['blank'] = True
|
2005-08-26 06:51:30 +08:00
|
|
|
Field.__init__(self, verbose_name, name, **kwargs)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "DateField"
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def to_python(self, value):
|
2007-02-26 13:07:12 +08:00
|
|
|
if value is None:
|
|
|
|
return value
|
2006-05-02 09:31:56 +08:00
|
|
|
if isinstance(value, datetime.datetime):
|
|
|
|
return value.date()
|
|
|
|
if isinstance(value, datetime.date):
|
|
|
|
return value
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
|
|
|
|
if not ansi_date_re.search(value):
|
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_('Enter a valid date in YYYY-MM-DD format.'))
|
|
|
|
# Now that we have the date string in YYYY-MM-DD format, check to make
|
|
|
|
# sure it's a valid date.
|
|
|
|
# We could use time.strptime here and catch errors, but datetime.date
|
|
|
|
# produces much friendlier error messages.
|
|
|
|
year, month, day = map(int, value.split('-'))
|
2006-07-01 02:57:23 +08:00
|
|
|
try:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
return datetime.date(year, month, day)
|
|
|
|
except ValueError, e:
|
|
|
|
msg = _('Invalid date: %s') % _(str(e))
|
|
|
|
raise exceptions.ValidationError(msg)
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2006-05-30 01:08:58 +08:00
|
|
|
def pre_save(self, model_instance, add):
|
2005-08-10 11:50:46 +08:00
|
|
|
if self.auto_now or (self.auto_now_add and add):
|
2006-05-30 01:08:58 +08:00
|
|
|
value = datetime.datetime.now()
|
|
|
|
setattr(model_instance, self.attname, value)
|
|
|
|
return value
|
|
|
|
else:
|
|
|
|
return super(DateField, self).pre_save(model_instance, add)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def contribute_to_class(self, cls, name):
|
|
|
|
super(DateField,self).contribute_to_class(cls, name)
|
|
|
|
if not self.null:
|
|
|
|
setattr(cls, 'get_next_by_%s' % self.name,
|
|
|
|
curry(cls._get_next_or_previous_by_FIELD, field=self, is_next=True))
|
|
|
|
setattr(cls, 'get_previous_by_%s' % self.name,
|
|
|
|
curry(cls._get_next_or_previous_by_FIELD, field=self, is_next=False))
|
|
|
|
|
2008-08-25 11:17:06 +08:00
|
|
|
def get_db_prep_lookup(self, lookup_type, value):
|
|
|
|
# For "__month" and "__day" lookups, convert the value to a string so
|
|
|
|
# the database backend always sees a consistent type.
|
|
|
|
if lookup_type in ('month', 'day'):
|
|
|
|
return [force_unicode(value)]
|
|
|
|
return super(DateField, self).get_db_prep_lookup(lookup_type, value)
|
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
# Casts dates into the format expected by the backend
|
|
|
|
return connection.ops.value_to_db_date(self.to_python(value))
|
2005-08-02 05:29:52 +08:00
|
|
|
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
def value_to_string(self, obj):
|
2005-11-26 05:20:09 +08:00
|
|
|
val = self._get_val_from_obj(obj)
|
2008-07-18 11:47:27 +08:00
|
|
|
if val is None:
|
|
|
|
data = ''
|
|
|
|
else:
|
|
|
|
data = datetime_safe.new_date(val).strftime("%Y-%m-%d")
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
return data
|
2005-11-26 05:20:09 +08:00
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': forms.DateField}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(DateField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class DateTimeField(DateField):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "DateTimeField"
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
def to_python(self, value):
|
2007-02-26 13:07:12 +08:00
|
|
|
if value is None:
|
|
|
|
return value
|
2006-05-02 09:31:56 +08:00
|
|
|
if isinstance(value, datetime.datetime):
|
|
|
|
return value
|
|
|
|
if isinstance(value, datetime.date):
|
|
|
|
return datetime.datetime(value.year, value.month, value.day)
|
2008-07-29 13:09:29 +08:00
|
|
|
|
|
|
|
# Attempt to parse a datetime:
|
|
|
|
value = smart_str(value)
|
|
|
|
# split usecs, because they are not recognized by strptime.
|
|
|
|
if '.' in value:
|
|
|
|
try:
|
|
|
|
value, usecs = value.split('.')
|
|
|
|
usecs = int(usecs)
|
|
|
|
except ValueError:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_('Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format.'))
|
2008-07-29 13:09:29 +08:00
|
|
|
else:
|
|
|
|
usecs = 0
|
|
|
|
kwargs = {'microsecond': usecs}
|
2006-05-02 09:31:56 +08:00
|
|
|
try: # Seconds are optional, so try converting seconds first.
|
2008-07-29 13:09:29 +08:00
|
|
|
return datetime.datetime(*time.strptime(value, '%Y-%m-%d %H:%M:%S')[:6],
|
|
|
|
**kwargs)
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
except ValueError:
|
|
|
|
try: # Try without seconds.
|
2008-07-29 13:09:29 +08:00
|
|
|
return datetime.datetime(*time.strptime(value, '%Y-%m-%d %H:%M')[:5],
|
|
|
|
**kwargs)
|
2006-05-02 09:31:56 +08:00
|
|
|
except ValueError: # Try without hour/minutes/seconds.
|
|
|
|
try:
|
2008-07-29 13:09:29 +08:00
|
|
|
return datetime.datetime(*time.strptime(value, '%Y-%m-%d')[:3],
|
|
|
|
**kwargs)
|
2006-05-02 09:31:56 +08:00
|
|
|
except ValueError:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_('Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format.'))
|
2006-05-02 09:31:56 +08:00
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
# Casts dates into the format expected by the backend
|
|
|
|
return connection.ops.value_to_db_datetime(self.to_python(value))
|
2006-05-02 09:31:56 +08:00
|
|
|
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
def value_to_string(self, obj):
|
2005-11-26 05:20:09 +08:00
|
|
|
val = self._get_val_from_obj(obj)
|
2008-07-18 11:47:27 +08:00
|
|
|
if val is None:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
data = ''
|
2008-07-18 11:47:27 +08:00
|
|
|
else:
|
|
|
|
d = datetime_safe.new_datetime(val)
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
data = d.strftime('%Y-%m-%d %H:%M:%S')
|
|
|
|
return data
|
2005-11-26 05:20:09 +08:00
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': forms.DateTimeField}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(DateTimeField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2007-05-21 09:29:58 +08:00
|
|
|
class DecimalField(Field):
|
|
|
|
empty_strings_allowed = False
|
|
|
|
def __init__(self, verbose_name=None, name=None, max_digits=None, decimal_places=None, **kwargs):
|
|
|
|
self.max_digits, self.decimal_places = max_digits, decimal_places
|
|
|
|
Field.__init__(self, verbose_name, name, **kwargs)
|
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "DecimalField"
|
|
|
|
|
2007-05-21 09:29:58 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
if value is None:
|
|
|
|
return value
|
|
|
|
try:
|
|
|
|
return decimal.Decimal(value)
|
|
|
|
except decimal.InvalidOperation:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
2007-07-31 01:25:35 +08:00
|
|
|
_("This value must be a decimal number."))
|
2007-05-21 09:29:58 +08:00
|
|
|
|
|
|
|
def _format(self, value):
|
2008-06-30 18:07:06 +08:00
|
|
|
if isinstance(value, basestring) or value is None:
|
2007-05-21 09:29:58 +08:00
|
|
|
return value
|
|
|
|
else:
|
|
|
|
return self.format_number(value)
|
|
|
|
|
|
|
|
def format_number(self, value):
|
|
|
|
"""
|
|
|
|
Formats a number into a string with the requisite number of digits and
|
|
|
|
decimal places.
|
|
|
|
"""
|
2008-07-29 13:09:29 +08:00
|
|
|
# Method moved to django.db.backends.util.
|
|
|
|
#
|
|
|
|
# It is preserved because it is used by the oracle backend
|
|
|
|
# (django.db.backends.oracle.query), and also for
|
|
|
|
# backwards-compatibility with any external code which may have used
|
|
|
|
# this method.
|
|
|
|
from django.db.backends import util
|
|
|
|
return util.format_number(value, self.max_digits, self.decimal_places)
|
2007-05-21 09:29:58 +08:00
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
2008-07-30 08:18:49 +08:00
|
|
|
return connection.ops.value_to_db_decimal(self.to_python(value),
|
|
|
|
self.max_digits, self.decimal_places)
|
2007-05-21 09:29:58 +08:00
|
|
|
|
|
|
|
def formfield(self, **kwargs):
|
|
|
|
defaults = {
|
|
|
|
'max_digits': self.max_digits,
|
|
|
|
'decimal_places': self.decimal_places,
|
|
|
|
'form_class': forms.DecimalField,
|
|
|
|
}
|
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(DecimalField, self).formfield(**defaults)
|
|
|
|
|
2006-05-02 09:31:56 +08:00
|
|
|
class EmailField(CharField):
|
2005-11-21 06:41:41 +08:00
|
|
|
def __init__(self, *args, **kwargs):
|
2007-09-20 07:33:57 +08:00
|
|
|
kwargs['max_length'] = kwargs.get('max_length', 75)
|
2006-05-02 09:31:56 +08:00
|
|
|
CharField.__init__(self, *args, **kwargs)
|
2005-11-21 06:41:41 +08:00
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': forms.EmailField}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(EmailField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2005-10-12 12:14:21 +08:00
|
|
|
class FilePathField(Field):
|
|
|
|
def __init__(self, verbose_name=None, name=None, path='', match=None, recursive=False, **kwargs):
|
|
|
|
self.path, self.match, self.recursive = path, match, recursive
|
2007-09-20 07:33:57 +08:00
|
|
|
kwargs['max_length'] = kwargs.get('max_length', 100)
|
2005-10-12 12:14:21 +08:00
|
|
|
Field.__init__(self, verbose_name, name, **kwargs)
|
2008-06-16 11:15:04 +08:00
|
|
|
|
2008-03-20 06:29:11 +08:00
|
|
|
def formfield(self, **kwargs):
|
|
|
|
defaults = {
|
|
|
|
'path': self.path,
|
|
|
|
'match': self.match,
|
|
|
|
'recursive': self.recursive,
|
|
|
|
'form_class': forms.FilePathField,
|
|
|
|
}
|
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(FilePathField, self).formfield(**defaults)
|
2005-10-12 12:14:21 +08:00
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "FilePathField"
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class FloatField(Field):
|
|
|
|
empty_strings_allowed = False
|
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
if value is None:
|
|
|
|
return None
|
|
|
|
return float(value)
|
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "FloatField"
|
|
|
|
|
2007-05-21 09:29:58 +08:00
|
|
|
def formfield(self, **kwargs):
|
|
|
|
defaults = {'form_class': forms.FloatField}
|
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(FloatField, self).formfield(**defaults)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
class IntegerField(Field):
|
|
|
|
empty_strings_allowed = False
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
if value is None:
|
|
|
|
return None
|
|
|
|
return int(value)
|
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "IntegerField"
|
|
|
|
|
2008-08-24 16:12:13 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
if value is None:
|
|
|
|
return value
|
|
|
|
try:
|
|
|
|
return int(value)
|
|
|
|
except (TypeError, ValueError):
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_("This value must be an integer."))
|
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': forms.IntegerField}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(IntegerField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class IPAddressField(Field):
|
2007-06-26 20:59:49 +08:00
|
|
|
empty_strings_allowed = False
|
2005-08-02 05:29:52 +08:00
|
|
|
def __init__(self, *args, **kwargs):
|
2007-08-05 13:14:46 +08:00
|
|
|
kwargs['max_length'] = 15
|
2005-08-02 05:29:52 +08:00
|
|
|
Field.__init__(self, *args, **kwargs)
|
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "IPAddressField"
|
|
|
|
|
2007-09-16 19:38:32 +08:00
|
|
|
def formfield(self, **kwargs):
|
|
|
|
defaults = {'form_class': forms.IPAddressField}
|
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(IPAddressField, self).formfield(**defaults)
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class NullBooleanField(Field):
|
2007-06-23 22:16:00 +08:00
|
|
|
empty_strings_allowed = False
|
2005-08-02 05:29:52 +08:00
|
|
|
def __init__(self, *args, **kwargs):
|
|
|
|
kwargs['null'] = True
|
|
|
|
Field.__init__(self, *args, **kwargs)
|
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "NullBooleanField"
|
|
|
|
|
2007-03-13 08:35:47 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
if value in (None, True, False): return value
|
2008-08-29 05:23:21 +08:00
|
|
|
if value in ('None',): return None
|
2007-03-13 08:35:47 +08:00
|
|
|
if value in ('t', 'True', '1'): return True
|
|
|
|
if value in ('f', 'False', '0'): return False
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_("This value must be either None, True or False."))
|
2007-03-13 08:35:47 +08:00
|
|
|
|
2008-08-29 10:40:56 +08:00
|
|
|
def get_db_prep_lookup(self, lookup_type, value):
|
|
|
|
# Special-case handling for filters coming from a web request (e.g. the
|
|
|
|
# admin interface). Only works for scalar values (not lists). If you're
|
|
|
|
# passing in a list, you might as well make things the right type when
|
|
|
|
# constructing the list.
|
|
|
|
if value in ('1', '0'):
|
|
|
|
value = bool(int(value))
|
|
|
|
return super(NullBooleanField, self).get_db_prep_lookup(lookup_type, value)
|
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
if value is None:
|
|
|
|
return None
|
|
|
|
return bool(value)
|
|
|
|
|
2007-12-17 18:35:53 +08:00
|
|
|
def formfield(self, **kwargs):
|
2008-07-19 07:54:34 +08:00
|
|
|
defaults = {
|
|
|
|
'form_class': forms.NullBooleanField,
|
|
|
|
'required': not self.blank,
|
|
|
|
'label': capfirst(self.verbose_name),
|
|
|
|
'help_text': self.help_text}
|
2007-12-17 18:35:53 +08:00
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(NullBooleanField, self).formfield(**defaults)
|
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
class PhoneNumberField(Field):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "PhoneNumberField"
|
|
|
|
|
2007-02-21 13:59:46 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-08 19:21:00 +08:00
|
|
|
from django.contrib.localflavor.us.forms import USPhoneNumberField
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': USPhoneNumberField}
|
2007-02-21 13:59:46 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(PhoneNumberField, self).formfield(**defaults)
|
2007-02-21 13:59:46 +08:00
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class PositiveIntegerField(IntegerField):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "PositiveIntegerField"
|
|
|
|
|
2007-09-15 10:37:07 +08:00
|
|
|
def formfield(self, **kwargs):
|
|
|
|
defaults = {'min_value': 0}
|
|
|
|
defaults.update(kwargs)
|
2007-12-17 18:35:53 +08:00
|
|
|
return super(PositiveIntegerField, self).formfield(**defaults)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
|
|
|
class PositiveSmallIntegerField(IntegerField):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "PositiveSmallIntegerField"
|
|
|
|
|
2007-09-15 10:37:07 +08:00
|
|
|
def formfield(self, **kwargs):
|
|
|
|
defaults = {'min_value': 0}
|
|
|
|
defaults.update(kwargs)
|
2007-12-17 18:35:53 +08:00
|
|
|
return super(PositiveSmallIntegerField, self).formfield(**defaults)
|
2007-09-15 10:37:07 +08:00
|
|
|
|
2007-09-08 13:09:39 +08:00
|
|
|
class SlugField(CharField):
|
2005-08-02 05:29:52 +08:00
|
|
|
def __init__(self, *args, **kwargs):
|
2007-08-05 13:14:46 +08:00
|
|
|
kwargs['max_length'] = kwargs.get('max_length', 50)
|
2005-08-02 05:29:52 +08:00
|
|
|
# Set db_index=True unless it's been set manually.
|
2007-04-26 21:30:48 +08:00
|
|
|
if 'db_index' not in kwargs:
|
2005-08-02 05:29:52 +08:00
|
|
|
kwargs['db_index'] = True
|
2007-09-08 13:09:39 +08:00
|
|
|
super(SlugField, self).__init__(*args, **kwargs)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "SlugField"
|
|
|
|
|
2008-08-23 12:59:25 +08:00
|
|
|
def formfield(self, **kwargs):
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
defaults = {'form_class': forms.SlugField}
|
2008-08-23 12:59:25 +08:00
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(SlugField, self).formfield(**defaults)
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class SmallIntegerField(IntegerField):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "SmallIntegerField"
|
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class TextField(Field):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "TextField"
|
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'widget': forms.Textarea}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(TextField, self).formfield(**defaults)
|
2007-01-11 07:34:37 +08:00
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class TimeField(Field):
|
|
|
|
empty_strings_allowed = False
|
2005-08-26 06:51:30 +08:00
|
|
|
def __init__(self, verbose_name=None, name=None, auto_now=False, auto_now_add=False, **kwargs):
|
2006-05-02 09:31:56 +08:00
|
|
|
self.auto_now, self.auto_now_add = auto_now, auto_now_add
|
2005-08-02 05:29:52 +08:00
|
|
|
if auto_now or auto_now_add:
|
|
|
|
kwargs['editable'] = False
|
2005-08-26 06:51:30 +08:00
|
|
|
Field.__init__(self, verbose_name, name, **kwargs)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "TimeField"
|
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def to_python(self, value):
|
|
|
|
if value is None:
|
|
|
|
return None
|
|
|
|
if isinstance(value, datetime.time):
|
|
|
|
return value
|
|
|
|
|
|
|
|
# Attempt to parse a datetime:
|
|
|
|
value = smart_str(value)
|
|
|
|
# split usecs, because they are not recognized by strptime.
|
|
|
|
if '.' in value:
|
|
|
|
try:
|
|
|
|
value, usecs = value.split('.')
|
|
|
|
usecs = int(usecs)
|
|
|
|
except ValueError:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_('Enter a valid time in HH:MM[:ss[.uuuuuu]] format.'))
|
2005-08-02 05:29:52 +08:00
|
|
|
else:
|
2008-07-29 13:09:29 +08:00
|
|
|
usecs = 0
|
|
|
|
kwargs = {'microsecond': usecs}
|
|
|
|
|
|
|
|
try: # Seconds are optional, so try converting seconds first.
|
|
|
|
return datetime.time(*time.strptime(value, '%H:%M:%S')[3:6],
|
|
|
|
**kwargs)
|
|
|
|
except ValueError:
|
|
|
|
try: # Try without seconds.
|
|
|
|
return datetime.time(*time.strptime(value, '%H:%M')[3:5],
|
|
|
|
**kwargs)
|
|
|
|
except ValueError:
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
raise exceptions.ValidationError(
|
|
|
|
_('Enter a valid time in HH:MM[:ss[.uuuuuu]] format.'))
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2006-05-30 01:08:58 +08:00
|
|
|
def pre_save(self, model_instance, add):
|
2005-08-10 11:50:46 +08:00
|
|
|
if self.auto_now or (self.auto_now_add and add):
|
2006-05-30 01:08:58 +08:00
|
|
|
value = datetime.datetime.now().time()
|
|
|
|
setattr(model_instance, self.attname, value)
|
|
|
|
return value
|
|
|
|
else:
|
|
|
|
return super(TimeField, self).pre_save(model_instance, add)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2008-07-29 13:09:29 +08:00
|
|
|
def get_db_prep_value(self, value):
|
|
|
|
# Casts times into the format expected by the backend
|
|
|
|
return connection.ops.value_to_db_time(self.to_python(value))
|
2005-08-02 05:29:52 +08:00
|
|
|
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
def value_to_string(self, obj):
|
2005-11-26 05:20:09 +08:00
|
|
|
val = self._get_val_from_obj(obj)
|
Removed oldforms, validators, and related code:
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
* Removed oldforms specific bits from model fields:
* Removed `validator_list` and `core` arguments from constructors.
* Removed the methods:
* `get_manipulator_field_names`
* `get_manipulator_field_objs`
* `get_manipulator_fields`
* `get_manipulator_new_data`
* `prepare_field_objs_and_params`
* `get_follow`
* Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
* Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
* Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
* Serialization framework
* `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
* Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
* Removed `django.core.validators`:
* Moved `ValidationError` exception to `django.core.exceptions`.
* For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
* Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
* Removed an oldforms-style model creation hack (refs #2160).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 15:19:44 +08:00
|
|
|
if val is None:
|
|
|
|
data = ''
|
|
|
|
else:
|
|
|
|
data = val.strftime("%H:%M:%S")
|
|
|
|
return data
|
2005-11-26 05:20:09 +08:00
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': forms.TimeField}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(TimeField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2007-01-09 04:28:31 +08:00
|
|
|
class URLField(CharField):
|
2005-08-26 06:51:30 +08:00
|
|
|
def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):
|
2007-08-05 13:14:46 +08:00
|
|
|
kwargs['max_length'] = kwargs.get('max_length', 200)
|
2006-12-16 02:32:42 +08:00
|
|
|
self.verify_exists = verify_exists
|
2007-01-09 04:28:31 +08:00
|
|
|
CharField.__init__(self, verbose_name, name, **kwargs)
|
2005-08-02 05:29:52 +08:00
|
|
|
|
2007-01-22 14:32:14 +08:00
|
|
|
def formfield(self, **kwargs):
|
2007-04-28 21:55:24 +08:00
|
|
|
defaults = {'form_class': forms.URLField, 'verify_exists': self.verify_exists}
|
2007-01-22 14:32:14 +08:00
|
|
|
defaults.update(kwargs)
|
2007-04-28 21:55:24 +08:00
|
|
|
return super(URLField, self).formfield(**defaults)
|
2006-12-16 02:32:42 +08:00
|
|
|
|
2005-08-02 05:29:52 +08:00
|
|
|
class USStateField(Field):
|
2008-02-19 10:58:41 +08:00
|
|
|
def get_internal_type(self):
|
|
|
|
return "USStateField"
|
|
|
|
|
2007-05-01 10:35:15 +08:00
|
|
|
def formfield(self, **kwargs):
|
|
|
|
from django.contrib.localflavor.us.forms import USStateSelect
|
|
|
|
defaults = {'widget': USStateSelect}
|
|
|
|
defaults.update(kwargs)
|
|
|
|
return super(USStateField, self).formfield(**defaults)
|
|
|
|
|
2005-09-29 07:08:47 +08:00
|
|
|
class XMLField(TextField):
|
2005-08-26 06:51:30 +08:00
|
|
|
def __init__(self, verbose_name=None, name=None, schema_path=None, **kwargs):
|
2005-08-02 05:29:52 +08:00
|
|
|
self.schema_path = schema_path
|
2005-08-26 06:51:30 +08:00
|
|
|
Field.__init__(self, verbose_name, name, **kwargs)
|