test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed an import * that was masking importing stuff from the wrong location

This commit is contained in:
Alex Gaynor 2013-09-14 12:32:25 -07:00
parent 28a571348b
commit 496b4d0331
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/backends/oracle/base.py
View File

@ -5,6 +5,7 @@ Requires cx_Oracle: http://cx-oracle.sourceforge.net/
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
import datetime
import decimal import decimal
import re import re
import platform import platform
@ -50,13 +51,16 @@ try:
except ImportError: except ImportError:
pytz = None pytz = None
from django.conf import settings
from django.db import utils from django.db import utils
from django.db.backends import * from django.db.backends import BaseDatabaseFeatures, BaseDatabaseOperations, BaseDatabaseWrapper, BaseDatabaseValidation, util
from django.db.backends.oracle.client import DatabaseClient from django.db.backends.oracle.client import DatabaseClient
from django.db.backends.oracle.creation import DatabaseCreation from django.db.backends.oracle.creation import DatabaseCreation
from django.db.backends.oracle.introspection import DatabaseIntrospection from django.db.backends.oracle.introspection import DatabaseIntrospection
from django.db.backends.oracle.schema import DatabaseSchemaEditor from django.db.backends.oracle.schema import DatabaseSchemaEditor
from django.utils import six, timezone
from django.utils.encoding import force_bytes, force_text from django.utils.encoding import force_bytes, force_text
from django.utils.functional import cached_property
DatabaseError = Database.DatabaseError DatabaseError = Database.DatabaseError