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/backends/creation.py | 8 ++++---- django/db/backends/postgresql/base.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'django/db/backends') diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py index 6cdf415f7a..407bf5cbbb 100644 --- a/django/db/backends/creation.py +++ b/django/db/backends/creation.py @@ -140,7 +140,7 @@ class BaseDatabaseCreation(object): import warnings warnings.warn( 'Database creation API for m2m tables has been deprecated. M2M models are now automatically generated', - PendingDeprecationWarning + DeprecationWarning ) output = [] @@ -154,7 +154,7 @@ class BaseDatabaseCreation(object): import warnings warnings.warn( 'Database creation API for m2m tables has been deprecated. M2M models are now automatically generated', - PendingDeprecationWarning + DeprecationWarning ) from django.db import models @@ -217,7 +217,7 @@ class BaseDatabaseCreation(object): import warnings warnings.warn( 'Database creation API for m2m tables has been deprecated. M2M models are now automatically generated', - PendingDeprecationWarning + DeprecationWarning ) from django.db import models @@ -322,7 +322,7 @@ class BaseDatabaseCreation(object): import warnings warnings.warn( 'Database creation API for m2m tables has been deprecated. M2M models are now automatically generated', - PendingDeprecationWarning + DeprecationWarning ) qn = self.connection.ops.quote_name diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index f84ad1da61..84b4c7f5f3 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -105,7 +105,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): import warnings warnings.warn( 'The "postgresql" backend has been deprecated. Use "postgresql_psycopg2" instead.', - PendingDeprecationWarning + DeprecationWarning ) self.features = DatabaseFeatures() -- cgit v1.3