From 1070c57b83efdfd4fbed09280fcdaafc6d9c1a81 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 11 Oct 2010 12:20:07 +0000 Subject: 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 --- django/db/models/fields/subclassing.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'django/db/models/fields') diff --git a/django/db/models/fields/subclassing.py b/django/db/models/fields/subclassing.py index bd11675ad3..3d04511dc2 100644 --- a/django/db/models/fields/subclassing.py +++ b/django/db/models/fields/subclassing.py @@ -15,14 +15,14 @@ def call_with_connection(func): if not updated: warn("A Field class whose %s method hasn't been updated to take a " "`connection` argument." % func.__name__, - PendingDeprecationWarning, stacklevel=2) + DeprecationWarning, stacklevel=2) def inner(*args, **kwargs): if 'connection' not in kwargs: from django.db import connection kwargs['connection'] = connection warn("%s has been called without providing a connection argument. " % - func.__name__, PendingDeprecationWarning, + func.__name__, DeprecationWarning, stacklevel=1) if updated: return func(*args, **kwargs) @@ -40,14 +40,14 @@ def call_with_connection_and_prepared(func): if not updated: warn("A Field class whose %s method hasn't been updated to take " "`connection` and `prepared` arguments." % func.__name__, - PendingDeprecationWarning, stacklevel=2) + DeprecationWarning, stacklevel=2) def inner(*args, **kwargs): if 'connection' not in kwargs: from django.db import connection kwargs['connection'] = connection warn("%s has been called without providing a connection argument. " % - func.__name__, PendingDeprecationWarning, + func.__name__, DeprecationWarning, stacklevel=1) if updated: return func(*args, **kwargs) -- cgit v1.3