From cf08ea496e9d40f2f5b3677feedb59cd600fab91 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 13 Apr 2010 02:00:46 +0000 Subject: [1.1.X] Refs #13227 -- Partial backport of r12865; backported the changes to Where tree cloning logic to ensure that unclonable objects in a where() clause don't break querying. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12963 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/queries/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/regressiontests/queries/models.py') diff --git a/tests/regressiontests/queries/models.py b/tests/regressiontests/queries/models.py index f01e5f2c3e..22ae530613 100644 --- a/tests/regressiontests/queries/models.py +++ b/tests/regressiontests/queries/models.py @@ -5,6 +5,7 @@ Various complex queries that have been problematic in the past. import datetime import pickle import sys +import threading from django.conf import settings from django.db import models @@ -44,6 +45,13 @@ class Note(models.Model): def __unicode__(self): return self.note + def __init__(self, *args, **kwargs): + super(Note, self).__init__(*args, **kwargs) + # Regression for #13227 -- having an attribute that + # is unpickleable doesn't stop you from cloning queries + # that use objects of that type as an argument. + self.lock = threading.Lock() + class Annotation(models.Model): name = models.CharField(max_length=10) tag = models.ForeignKey(Tag) -- cgit v1.3