From ad24403e8b4d2059d2e9f12565740c55326923a0 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 17 Feb 2006 12:56:48 +0000 Subject: [PATCH] magic-removal: Fixes #1363 -- Moved a Python2.3 declaration of set from base to query, following the refactoring of delete code. Thanks, Esaj. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2314 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/base.py | 4 ---- django/db/models/query.py | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index 6d823b62cb..9307a80647 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -17,10 +17,6 @@ import types import sys import os -# For Python 2.3 -if not hasattr(__builtins__, 'set'): - from sets import Set as set - class ModelBase(type): "Metaclass for all models" def __new__(cls, name, bases, attrs): diff --git a/django/db/models/query.py b/django/db/models/query.py index c8d75bba72..408fe1ff47 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -6,6 +6,10 @@ from django.utils.datastructures import SortedDict import operator +# For Python 2.3 +if not hasattr(__builtins__, 'set'): + from sets import Set as set + LOOKUP_SEPARATOR = '__' # Size of each "chunk" for get_iterator calls.