Changeset 6453

Timestamp:

10/03/07 20:55:51 (9 months ago)

Author:

mtredinnick

Message:

Fixed #5641 -- Handle lazy translations correctly when used as default arguments. Thanks, permon.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/tests/modeltests/basic/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/field_defaults/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/i18n/models.py (modified) (1 diff)

django/trunk/django/db/models/fields/__init__.py

@@ -239 +239 @@
-            if callable(self.default):
-                return self.default()
-self.default
+force_unicode(self.default, strings_only=True)
-        if not self.empty_strings_allowed or (self.null and settings.DATABASE_ENGINE != 'oracle'):
-            return None

django/trunk/tests/modeltests/basic/models.py

@@ -153 +153 @@
->>> a6.save()
->>> a6.headline
-
+u
-
-# For DateTimeFields, Django saves as much precision (in seconds) as you

django/trunk/tests/modeltests/field_defaults/models.py

@@ -43 +43 @@
-# Access database columns via Python attributes.
->>> a.headline
-
+u
-
-# make sure the two dates are sufficiently close

django/trunk/tests/regressiontests/i18n/models.py

@@ +1 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+class TestModel(models.Model):
+    text = models.CharField(max_length=10, default=_('Anything'))
+
+__test__ = {'API_TESTS': '''
+>>> tm = TestModel()
+>>> tm.save()
+'''
+}
+