Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 6 insertions, 3 deletions

diff --git a/tests/modeltests/custom_pk/fields.py b/tests/modeltests/custom_pk/fields.py
index 2eeb80e6ac..40551a363c 100644
--- a/tests/modeltests/custom_pk/fields.py
+++ b/tests/modeltests/custom_pk/fields.py
@@ -40,14 +40,14 @@ class MyAutoField(models.CharField):
             value = MyWrapper(value)
         return value
 
-    def get_db_prep_save(self, value):
+    def get_db_prep_save(self, value, connection):
         if not value:
             return
         if isinstance(value, MyWrapper):
             return unicode(value)
         return value
 
-    def get_db_prep_value(self, value):
+    def get_db_prep_value(self, value, connection, prepared=False):
         if not value:
             return
         if isinstance(value, MyWrapper):
diff --git a/tests/modeltests/field_subclassing/fields.py b/tests/modeltests/field_subclassing/fields.py
index 1f9bdf5e0a..f667310c58 100644
--- a/tests/modeltests/field_subclassing/fields.py
+++ b/tests/modeltests/field_subclassing/fields.py
@@ -3,6 +3,8 @@ from django.db import models
 from django.utils import simplejson as json
 from django.utils.encoding import force_unicode
 
+import warnings
+warnings.filterwarnings("ignore", category=DeprecationWarning, module='django.db.models.fields.subclassing')
 
 class Small(object):
     """
diff --git a/tests/modeltests/serializers/models.py b/tests/modeltests/serializers/models.py
index c12e73fd6e..7f0019fbcd 100644
--- a/tests/modeltests/serializers/models.py
+++ b/tests/modeltests/serializers/models.py
@@ -9,6 +9,7 @@
 from decimal import Decimal
 from django.db import models
 
+
 class Category(models.Model):
     name = models.CharField(max_length=20)
 
@@ -96,7 +97,7 @@ class TeamField(models.CharField):
     def __init__(self):
         super(TeamField, self).__init__(max_length=100)
 
-    def get_db_prep_save(self, value):
+    def get_db_prep_save(self, value, connection):
         return unicode(value.title)
 
     def to_python(self, value):