Commit c4aa26a9 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Internal refactoring; moving LOOKUP_SEP up one level. 

In an ideal world, nothing except django.db.models.query should have to
import stuff from django.models.sql.*. A few things were needing to get
hold of sql.constants.LOOKUP_SEP, so this commit moves it up to
django.db.models.constants.LOOKUP_SEP.

There are still a couple of places (admin) poking into sql.* to get
QUERY_TERMS, which is unfortunate, but a slightly different issue and
harder to adjust.
parent a78dd109

django/contrib/admin/options.py

+2 −1
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ from django.core.exceptions import PermissionDenied, ValidationError 
from django.core.paginator import Paginator

from django.core.urlresolvers import reverse

from django.db import models, transaction, router

from django.db.models.constants import LOOKUP_SEP

from django.db.models.related import RelatedObject

from django.db.models.fields import BLANK_CHOICE_DASH, FieldDoesNotExist

from django.db.models.sql.constants import LOOKUP_SEP, QUERY_TERMS

from django.db.models.sql.constants import QUERY_TERMS

from django.http import Http404, HttpResponse, HttpResponseRedirect

from django.shortcuts import get_object_or_404

from django.template.response import SimpleTemplateResponse, TemplateResponse

django/contrib/admin/util.py

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import datetime 
import decimal



from django.db import models

from django.db.models.sql.constants import LOOKUP_SEP

from django.db.models.constants import LOOKUP_SEP

from django.db.models.deletion import Collector

from django.db.models.related import RelatedObject

from django.forms.forms import pretty_name

django/contrib/gis/db/models/sql/where.py

+1 −1
Original line number Diff line number Diff line 
from django.db.models.constants import LOOKUP_SEP

from django.db.models.fields import FieldDoesNotExist

from django.db.models.sql.constants import LOOKUP_SEP

from django.db.models.sql.expressions import SQLEvaluator

from django.db.models.sql.where import Constraint, WhereNode

from django.contrib.gis.db.models.fields import GeometryField

django/db/models/constants.py

0 → 100644
+7 −0
Original line number Diff line number Diff line 
"""

Constants used across the ORM in general.

"""



# Separator used to split filter strings apart.

LOOKUP_SEP = '__'

django/db/models/query.py

+1 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import sys 


from django.core import exceptions

from django.db import connections, router, transaction, IntegrityError

from django.db.models.constants import LOOKUP_SEP

from django.db.models.fields import AutoField

from django.db.models.query_utils import (Q, select_related_descend,

    deferred_class_factory, InvalidQuery)
@@ -1613,8 +1614,6 @@ def prefetch_related_objects(result_cache, related_lookups): 
    Populates prefetched objects caches for a list of results

    from a QuerySet

    """

    from django.db.models.sql.constants import LOOKUP_SEP



    if len(result_cache) == 0:

        return # nothing to do