Refs #24919 -- Made test models serializable for migrations.

2 files changed, 9 insertions, 20 deletions

diff --git a/tests/queryset_pickle/models.py b/tests/queryset_pickle/models.py
index 77134a5018..bb20e71524 100644
--- a/tests/queryset_pickle/models.py
+++ b/tests/queryset_pickle/models.py
@@ -1,6 +1,7 @@
 import datetime
 
 from django.db import DJANGO_VERSION_PICKLE_KEY, models
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -13,15 +14,6 @@ class Numbers(object):
     def get_static_number():
         return 2
 
-    @classmethod
-    def get_class_number(cls):
-        return 3
-
-    def get_member_number(self):
-        return 4
-
-nn = Numbers()
-
 
 class PreviousDjangoVersionQuerySet(models.QuerySet):
     def __getstate__(self):
@@ -51,11 +43,11 @@ class Event(models.Model):
 
 class Happening(models.Model):
     when = models.DateTimeField(blank=True, default=datetime.datetime.now)
-    name = models.CharField(blank=True, max_length=100, default=lambda: "test")
+    name = models.CharField(blank=True, max_length=100, default="test")
     number1 = models.IntegerField(blank=True, default=standalone_number)
-    number2 = models.IntegerField(blank=True, default=Numbers.get_static_number)
-    number3 = models.IntegerField(blank=True, default=Numbers.get_class_number)
-    number4 = models.IntegerField(blank=True, default=nn.get_member_number)
+    if six.PY3:
+        # default serializable on Python 3 only
+        number2 = models.IntegerField(blank=True, default=Numbers.get_static_number)
 
 
 class Container(object):
diff --git a/tests/queryset_pickle/tests.py b/tests/queryset_pickle/tests.py
index 6ac51c8431..63f4283870 100644
--- a/tests/queryset_pickle/tests.py
+++ b/tests/queryset_pickle/tests.py
@@ -2,9 +2,11 @@ from __future__ import unicode_literals
 
 import datetime
 import pickle
+import unittest
 import warnings
 
 from django.test import TestCase
+from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.version import get_version
 
@@ -28,21 +30,16 @@ class PickleabilityTestCase(TestCase):
     def test_datetime_callable_default_filter(self):
         self.assert_pickles(Happening.objects.filter(when=datetime.datetime.now()))
 
-    def test_lambda_as_default(self):
+    def test_string_as_default(self):
         self.assert_pickles(Happening.objects.filter(name="test"))
 
     def test_standalone_method_as_default(self):
         self.assert_pickles(Happening.objects.filter(number1=1))
 
+    @unittest.skipIf(six.PY2, "Field doesn't exist on Python 2.")
     def test_staticmethod_as_default(self):
         self.assert_pickles(Happening.objects.filter(number2=1))
 
-    def test_classmethod_as_default(self):
-        self.assert_pickles(Happening.objects.filter(number3=1))
-
-    def test_membermethod_as_default(self):
-        self.assert_pickles(Happening.objects.filter(number4=1))
-
     def test_filter_reverse_fk(self):
         self.assert_pickles(Group.objects.filter(event=1))