Commit 321fe61f authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python...

[1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.

Backport of [11901].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent de2c7d9f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
Form Widget classes specific to the Django admin site.
"""

import copy
import django.utils.copycompat as copy

from django import forms
from django.forms.widgets import RadioFieldRenderer
+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ class GEOSTest(unittest.TestCase):

    def test22_copy(self):
        "Testing use with the Python `copy` module."
        import copy
        import django.utils.copycompat as copy
        poly = GEOSGeometry('POLYGON((0 0, 0 23, 23 23, 23 0, 0 0), (5 5, 5 10, 10 10, 10 5, 5 5))')
        cpy1 = copy.copy(poly)
        cpy2 = copy.deepcopy(poly)
+3 −1
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@
# Modified from original contribution by Aryeh Leib Taurog, which was
# released under the New BSD license.
import unittest

import django.utils.copycompat as copy

from django.contrib.gis.geos import *
from django.contrib.gis.geos.error import GEOSIndexError
import copy

def getItem(o,i): return o[i]
def delItem(o,i): del o[i]
+1 −1
Original line number Diff line number Diff line
import os, unittest
from copy import copy
from decimal import Decimal
from models import City, County, CountyFeat, Interstate, ICity1, ICity2, State, city_mapping, co_mapping, cofeat_mapping, inter_mapping
from django.contrib.gis.db.backend import SpatialBackend
from django.contrib.gis.utils.layermapping import LayerMapping, LayerMapError, InvalidDecimal, MissingForeignKey
from django.contrib.gis.gdal import DataSource
from django.utils.copycompat import copy

shp_path = os.path.dirname(__file__)
city_shp = os.path.join(shp_path, '../data/cities/cities.shp')
+1 −1
Original line number Diff line number Diff line
import copy
import types
import sys
import os
@@ -18,6 +17,7 @@ from django.db.models.options import Options
from django.db import connection, transaction, DatabaseError
from django.db.models import signals
from django.db.models.loading import register_models, get_model
import django.utils.copycompat as copy
from django.utils.functional import curry
from django.utils.encoding import smart_str, force_unicode, smart_unicode
from django.conf import settings
Loading