From 93f92635b69c16a79ae546e060522eb437dc1c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Mon, 29 Aug 2011 23:01:25 +0000 Subject: [PATCH] Follow the same convention as the rest of the file. Still cleanup after [16708] git-svn-id: http://code.djangoproject.com/svn/django/trunk@16710 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/postgresql_psycopg2/base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index 4e8268bf13..7efa6e67b2 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -19,7 +19,6 @@ from django.utils.log import getLogger try: import psycopg2 as Database import psycopg2.extensions - import psycopg2.Error except ImportError, e: from django.core.exceptions import ImproperlyConfigured raise ImproperlyConfigured("Error loading psycopg2 module: %s" % e) @@ -125,7 +124,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): try: self.connection.close() self.connection = None - except psycopg2.Error: + except Database.Error: # In some cases (database restart, network connection lost etc...) # the connection to the database is lost without giving Django a # notification. If we don't set self.connection to None, the error