From 496b4d03314a96549d3e1f5c69d2d35bc4716906 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 14 Sep 2013 12:32:25 -0700 Subject: [PATCH] Removed an import * that was masking importing stuff from the wrong location --- django/db/backends/oracle/base.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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