Remove several more relative imports.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17007 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 6 insertions, 3 deletions

diff --git a/django/db/models/sql/__init__.py b/django/db/models/sql/__init__.py
index 7310982690..c07f2b7b23 100644
--- a/django/db/models/sql/__init__.py
+++ b/django/db/models/sql/__init__.py
@@ -1,7 +1,7 @@
 from query import *
 from subqueries import *
-from where import AND, OR
-from datastructures import EmptyResultSet
+from django.db.models.sql.datastructures import EmptyResultSet
+from django.db.models.sql.where import AND, OR
 
 __all__ = ['Query', 'AND', 'OR', 'EmptyResultSet']
 
diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py
index 3e9dbf0527..1455ba6e18 100644
--- a/django/db/models/sql/where.py
+++ b/django/db/models/sql/where.py
@@ -1,12 +1,15 @@
 """
 Code to manage the creation and SQL rendering of 'where' constraints.
 """
+
+from __future__ import absolute_import
+
 import datetime
 from itertools import repeat
 
 from django.utils import tree
 from django.db.models.fields import Field
-from datastructures import EmptyResultSet, FullResultSet
+from django.db.models.sql.datastructures import EmptyResultSet, FullResultSet
 
 # Connection types
 AND = 'AND'