summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2007-09-14 16:48:47 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2007-09-14 16:48:47 +0000
commit42f4f44356044ee57b7efd32a423c01e2b9454bc (patch)
tree6577b17e12bde997ff1ad09ec148e05a54c1578d /django
parentf36e96cc9c6c1e99fb55cfc6940f04fa9a7c86ff (diff)
Fixed #3146: DateFields no longer barf when confronted by strings. Thanks, Deepak Thukral.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 795f8936bd..3792a30a88 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -538,7 +538,12 @@ class DateField(Field):
def get_db_prep_save(self, value):
# Casts dates into string format for entry into database.
if value is not None:
- value = value.strftime('%Y-%m-%d')
+ try:
+ value = value.strftime('%Y-%m-%d')
+ except AttributeError:
+ # If value is already a string it won't have a strftime method,
+ # so we'll just let it pass through.
+ pass
return Field.get_db_prep_save(self, value)
def get_manipulator_field_objs(self):