From dd1ab8982be0ab8bd648b57c0bbc6a100a429695 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 15 Oct 2013 16:36:31 +0200 Subject: [PATCH] Moved misplaced import in backends init --- django/db/backends/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py index 8dd15dfee13..00c5776d59f 100644 --- a/django/db/backends/__init__.py +++ b/django/db/backends/__init__.py @@ -1,8 +1,6 @@ import datetime import time -from django.db.utils import DatabaseError, ProgrammingError - try: from django.utils.six.moves import _thread as thread except ImportError: @@ -16,7 +14,7 @@ from django.db import DEFAULT_DB_ALIAS from django.db.backends.signals import connection_created from django.db.backends import utils from django.db.transaction import TransactionManagementError -from django.db.utils import DatabaseErrorWrapper +from django.db.utils import DatabaseError, DatabaseErrorWrapper, ProgrammingError from django.utils.functional import cached_property from django.utils import six from django.utils import timezone