Ticket #3148: django-3148.diff

django/db/models/fields/__init__.py

@@ -97 +97 @@
             self.creation_counter = Field.creation_counter
             Field.creation_counter += 1
 
+        self._property = {} #  stores kwargs for property ('fget', 'fset', 'fdel')
+
     def __cmp__(self, other):
         # This is needed because bisect does not take a comparison function.
         return cmp(self.creation_counter, other.creation_counter)
@@ -148 +150 @@
         return self._unique or self.primary_key
     unique = property(unique)
 
+    def setter(self, f):
+        self._property['fset'] = f
+        return f
+
+    def getter(self, f):
+        self._property['fget'] = f
+        return f
+
+    def deleter(self, f):
+        self._property['fdel'] = f
+        return f
+
     def set_attributes_from_name(self, name):
         self.name = name
         self.attname, self.column = self.get_attname_column()
@@ -160 +174 @@
         if self.choices:
             setattr(cls, 'get_%s_display' % self.name, curry(cls._get_FIELD_display, field=self))
 
+        if self._property:
+            setattr(cls, name, property(**self._property))
+            del(self._property)
+
+
     def get_attname(self):
         return self.name
 

tests/regressiontests/model_fields/tests.py

@@ -7 +7 @@
 from django.core.exceptions import ValidationError
 
 from models import Foo, Bar, Whiz, BigD, BigS, Image
+from models import FooGetSet
 
 try:
     from decimal import Decimal
@@ -144 +145 @@
         bs = BigS.objects.create(s = 'slug'*50)
         bs = BigS.objects.get(pk=bs.pk)
         self.assertEqual(bs.s, 'slug'*50)
+
+class FieldProperties(django.test.TestCase):
+    def test_get_set(self):
+        """
+        Test basic getter and setter functionality of a SlugField
+        """
+        f = FooGetSet( s = "test" )
+        self.assertEqual(f.s, "test")
+        f.s = "test2"
+        self.assertEqual(f.s, "test2")
+
+        def set_non_acceptable():
+            f.s = "not_acceptable"
+        self.assertRaises(ValueError, set_non_acceptable)
+        self.assertEqual(f.s, "test2")
+
+        f.save()
+        f = FooGetSet.objects.get(pk=f.pk)
+        self.assertEqual(f.s, "test2")
+
+        self.assertEqual(f.file.__class__.__name__, "FieldFile")
+

tests/regressiontests/model_fields/models.py

@@ -17 +17 @@
 from django.db import models
 from django.db.models.fields.files import ImageFieldFile, ImageField
 
+temp_storage_location = tempfile.mkdtemp()
+temp_storage = FileSystemStorage(location=temp_storage_location)
 
 class Foo(models.Model):
     a = models.CharField(max_length=10)
@@ -51 +53 @@
 class BigS(models.Model):
     s = models.SlugField(max_length=255)
 
+class FooGetSet(models.Model):
+    s = models.SlugField(max_length=255)
+    file = models.FileField(storage=temp_storage, upload_to='tests')
 
+    @s.getter
+    def get_s(self):
+        return self._s
+    @s.setter
+    def set_s(self, value):
+        if value is "not_acceptable":
+            raise ValueError("not acceptable")
+        self._s = value
+
+    @file.getter
+    def get_file(self):
+        assert False
+    @file.setter
+    def set_file(self, value):
+        assert False
+
 ###############################################################################
 # ImageField