Added buildout stuff and made changes accordingly

--HG--
rename : profile/management/__init__.py => eggs/djangorecipe-0.20-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/djangorecipe-0.20-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/infrae.subversion-1.4.5-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/infrae.subversion-1.4.5-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/mercurial-1.7.3-py2.6-linux-x86_64.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/mercurial-1.7.3-py2.6-linux-x86_64.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/py-1.4.0-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/py-1.4.0-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/zc.buildout-1.5.2-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/zc.buildout-1.5.2-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => eggs/zc.recipe.egg-1.3.2-py2.6.egg/EGG-INFO/dependency_links.txt
rename : profile/management/__init__.py => eggs/zc.recipe.egg-1.3.2-py2.6.egg/EGG-INFO/not-zip-safe
rename : profile/management/__init__.py => parts/django/Django.egg-info/dependency_links.txt
rename : taskapp/models.py => parts/django/django/conf/app_template/models.py
rename : taskapp/tests.py => parts/django/django/conf/app_template/tests.py
rename : taskapp/views.py => parts/django/django/conf/app_template/views.py
rename : taskapp/views.py => parts/django/django/contrib/gis/tests/geo3d/views.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/delete/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/files/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/invalid_models/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/m2m_signals/__init__.py
rename : profile/management/__init__.py => parts/django/tests/modeltests/model_package/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/management/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/management/commands/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/bash_completion/models.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/delete_regress/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/file_storage/__init__.py
rename : profile/management/__init__.py => parts/django/tests/regressiontests/max_lengths/__init__.py
rename : profile/forms.py => pytask/profile/forms.py
rename : profile/management/__init__.py => pytask/profile/management/__init__.py
rename : profile/management/commands/seed_db.py => pytask/profile/management/commands/seed_db.py
rename : profile/models.py => pytask/profile/models.py
rename : profile/templatetags/user_tags.py => pytask/profile/templatetags/user_tags.py
rename : taskapp/tests.py => pytask/profile/tests.py
rename : profile/urls.py => pytask/profile/urls.py
rename : profile/utils.py => pytask/profile/utils.py
rename : profile/views.py => pytask/profile/views.py
rename : static/css/base.css => pytask/static/css/base.css
rename : taskapp/tests.py => pytask/taskapp/tests.py
rename : taskapp/views.py => pytask/taskapp/views.py
rename : templates/base.html => pytask/templates/base.html
rename : templates/profile/browse_notifications.html => pytask/templates/profile/browse_notifications.html
rename : templates/profile/edit.html => pytask/templates/profile/edit.html
rename : templates/profile/view.html => pytask/templates/profile/view.html
rename : templates/profile/view_notification.html => pytask/templates/profile/view_notification.html
rename : templates/registration/activate.html => pytask/templates/registration/activate.html
rename : templates/registration/activation_email.txt => pytask/templates/registration/activation_email.txt
rename : templates/registration/activation_email_subject.txt => pytask/templates/registration/activation_email_subject.txt
rename : templates/registration/logged_out.html => pytask/templates/registration/logged_out.html
rename : templates/registration/login.html => pytask/templates/registration/login.html
rename : templates/registration/logout.html => pytask/templates/registration/logout.html
rename : templates/registration/password_change_done.html => pytask/templates/registration/password_change_done.html
rename : templates/registration/password_change_form.html => pytask/templates/registration/password_change_form.html
rename : templates/registration/password_reset_complete.html => pytask/templates/registration/password_reset_complete.html
rename : templates/registration/password_reset_confirm.html => pytask/templates/registration/password_reset_confirm.html
rename : templates/registration/password_reset_done.html => pytask/templates/registration/password_reset_done.html
rename : templates/registration/password_reset_email.html => pytask/templates/registration/password_reset_email.html
rename : templates/registration/password_reset_form.html => pytask/templates/registration/password_reset_form.html
rename : templates/registration/registration_complete.html => pytask/templates/registration/registration_complete.html
rename : templates/registration/registration_form.html => pytask/templates/registration/registration_form.html
rename : utils.py => pytask/utils.py

1 files changed, 81 insertions, 0 deletions

diff --git a/parts/django/tests/modeltests/field_subclassing/tests.py b/parts/django/tests/modeltests/field_subclassing/tests.py
new file mode 100644
index 0000000..25f5160
--- /dev/null
+++ b/parts/django/tests/modeltests/field_subclassing/tests.py
@@ -0,0 +1,81 @@
+from django.core import serializers
+from django.test import TestCase
+
+from fields import Small
+from models import DataModel, MyModel, OtherModel
+
+
+class CustomField(TestCase):
+    def test_defer(self):
+        d = DataModel.objects.create(data=[1, 2, 3])
+
+        self.assertTrue(isinstance(d.data, list))
+
+        d = DataModel.objects.get(pk=d.pk)
+        self.assertTrue(isinstance(d.data, list))
+        self.assertEqual(d.data, [1, 2, 3])
+
+        d = DataModel.objects.defer("data").get(pk=d.pk)
+        d.save()
+
+        d = DataModel.objects.get(pk=d.pk)
+        self.assertTrue(isinstance(d.data, list))
+        self.assertEqual(d.data, [1, 2, 3])
+
+    def test_custom_field(self):
+        # Creating a model with custom fields is done as per normal.
+        s = Small(1, 2)
+        self.assertEqual(str(s), "12")
+
+        m = MyModel.objects.create(name="m", data=s)
+        # Custom fields still have normal field's attributes.
+        self.assertEqual(m._meta.get_field("data").verbose_name, "small field")
+
+        # The m.data attribute has been initialised correctly. It's a Small
+        # object.
+        self.assertEqual((m.data.first, m.data.second), (1, 2))
+
+        # The data loads back from the database correctly and 'data' has the
+        # right type.
+        m1 = MyModel.objects.get(pk=m.pk)
+        self.assertTrue(isinstance(m1.data, Small))
+        self.assertEqual(str(m1.data), "12")
+
+        # We can do normal filtering on the custom field (and will get an error
+        # when we use a lookup type that does not make sense).
+        s1 = Small(1, 3)
+        s2 = Small("a", "b")
+        self.assertQuerysetEqual(
+            MyModel.objects.filter(data__in=[s, s1, s2]), [
+                "m",
+            ],
+            lambda m: m.name,
+        )
+        self.assertRaises(TypeError, lambda: MyModel.objects.filter(data__lt=s))
+
+        # Serialization works, too.
+        stream = serializers.serialize("json", MyModel.objects.all())
+        self.assertEqual(stream, '[{"pk": 1, "model": "field_subclassing.mymodel", "fields": {"data": "12", "name": "m"}}]')
+
+        obj = list(serializers.deserialize("json", stream))[0]
+        self.assertEqual(obj.object, m)
+
+        # Test retrieving custom field data
+        m.delete()
+
+        m1 = MyModel.objects.create(name="1", data=Small(1, 2))
+        m2 = MyModel.objects.create(name="2", data=Small(2, 3))
+
+        self.assertQuerysetEqual(
+            MyModel.objects.all(), [
+                "12",
+                "23",
+            ],
+            lambda m: str(m.data)
+        )
+
+    def test_field_subclassing(self):
+        o = OtherModel.objects.create(data=Small("a", "b"))
+        o = OtherModel.objects.get()
+        self.assertEqual(o.data.first, "a")
+        self.assertEqual(o.data.second, "b")