diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-09-14 12:32:25 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-09-14 12:32:25 -0700 |
| commit | 496b4d03314a96549d3e1f5c69d2d35bc4716906 (patch) | |
| tree | 5d3960452303e8fcd7501b4f6f511db440cc31b1 | |
| parent | 28a571348bca9c5a3c137e495e7d3c9349a5bd56 (diff) | |
Removed an import * that was masking importing stuff from the wrong location
| -rw-r--r-- | django/db/backends/oracle/base.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 31609bf4be..c9b3fbfd27 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -5,6 +5,7 @@ Requires cx_Oracle: http://cx-oracle.sourceforge.net/ """ from __future__ import unicode_literals +import datetime import decimal import re import platform @@ -50,13 +51,16 @@ try: except ImportError: pytz = None +from django.conf import settings 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.creation import DatabaseCreation from django.db.backends.oracle.introspection import DatabaseIntrospection 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.functional import cached_property DatabaseError = Database.DatabaseError |
