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

@@ -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):

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.