diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index e9e3f4a0a3..05f16db9fe 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -404,7 +404,7 @@ class Field(object): return first_choice + list(self.flatchoices) def _get_val_from_obj(self, obj): - if obj: + if obj is not None: return getattr(obj, self.attname) else: return self.get_default() diff --git a/tests/regressiontests/serializers_regress/models.py b/tests/regressiontests/serializers_regress/models.py index ccd850326d..bec0a98202 100644 --- a/tests/regressiontests/serializers_regress/models.py +++ b/tests/regressiontests/serializers_regress/models.py @@ -258,3 +258,9 @@ class InheritBaseModel(BaseModel): class ExplicitInheritBaseModel(BaseModel): parent = models.OneToOneField(BaseModel) child_data = models.IntegerField() + +class LengthModel(models.Model): + data = models.IntegerField() + + def __len__(self): + return self.data diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/regressiontests/serializers_regress/tests.py index 11b53a5277..84e90ff7e1 100644 --- a/tests/regressiontests/serializers_regress/tests.py +++ b/tests/regressiontests/serializers_regress/tests.py @@ -8,7 +8,9 @@ forward, backwards and self references. """ -import unittest, datetime +import datetime +import decimal +import unittest from cStringIO import StringIO from django.utils.functional import curry @@ -18,10 +20,6 @@ from django.core import management from django.conf import settings from models import * -try: - import decimal -except ImportError: - from django.utils import _decimal as decimal # A set of functions that can be used to recreate # test data objects of various kinds. @@ -326,6 +324,8 @@ The end."""), (data_obj, 1001, BigIntegerData, -9223372036854775808), (data_obj, 1002, BigIntegerData, 0), (data_obj, 1003, BigIntegerData, None), + (data_obj, 1004, LengthModel, 0), + (data_obj, 1005, LengthModel, 1), ] # Because Oracle treats the empty string as NULL, Oracle is expected to fail