Context Navigation

Ticket #12546: django-len-serialization.diff

File django-len-serialization.diff, 2.1 KB (added by Alex Gaynor, 14 years ago)

diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index e9e3f4a..05f16db 100644

                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 ccd8503..087551e 100644

                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 11b53a5..84e90ff 100644

                forward, backwards and self references.
 """
+import unittest, datetime
+import datetime
+import decimal
+import unittest
 from cStringIO import StringIO
 from django.utils.functional import curry
-…
+               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.
-…
+               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