Commit 6ca3154b authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept into the 1.1.X branch. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6c031fbe

django/db/models/base.py

+4 −4
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ class ModelBase(type): 
        new_class.add_to_class('_meta', Options(meta, **kwargs))

        if not abstract:

            new_class.add_to_class('DoesNotExist', subclass_exception('DoesNotExist',

                    tuple(x.DoesNotExist

                            for x in parents if hasattr(x, '_meta') and not x._meta.abstract)

                    tuple([x.DoesNotExist

                            for x in parents if hasattr(x, '_meta') and not x._meta.abstract])

                                    or (ObjectDoesNotExist,), module))

            new_class.add_to_class('MultipleObjectsReturned', subclass_exception('MultipleObjectsReturned',

                    tuple(x.MultipleObjectsReturned

                            for x in parents if hasattr(x, '_meta') and not x._meta.abstract)

                    tuple([x.MultipleObjectsReturned

                            for x in parents if hasattr(x, '_meta') and not x._meta.abstract])

                                    or (MultipleObjectsReturned,), module))

            if base_meta and not base_meta.abstract:

                # Non-abstract child classes inherit some attributes from their

django/db/models/fields/__init__.py

+6 −2
Original line number Diff line number Diff line 
import datetime

import decimal

import os

import re

import time



import django.utils.copycompat as copy



try:

    import decimal

except ImportError:

    from django.utils import _decimal as decimal    # for Python 2.3



from django.db import connection

from django.db.models import signals

from django.db.models.query_utils import QueryWrapper

django/db/models/loading.py

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ class AppCache(object): 
        model_list = []

        for app in app_list:

            model_list.extend(

                model for model in app.values()

                if (not model._deferred or include_deferred)

                [model for model in app.values()

                if (not model._deferred or include_deferred)]

            )

        return model_list

django/db/models/query_utils.py

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ from django.utils.copycompat import deepcopy 
from django.utils import tree

from django.utils.datastructures import SortedDict



try:

    sorted

except NameError:

    from django.utils.itercompat import sorted  # For Python 2.3.



class CyclicDependency(Exception):

    """

django/db/models/sql/query.py

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ from django.db.models.fields import FieldDoesNotExist 
from django.db.models.query_utils import select_related_descend

from django.db.models.sql import aggregates as base_aggregates_module

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

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

    ExtraWhere, AND, OR)

from django.db.models.sql.where import WhereNode, Constraint, EverythingNode, ExtraWhere, AND, OR

from django.core.exceptions import FieldError

from datastructures import EmptyResultSet, Empty, MultiJoin

from constants import *