Removed Python 2.3 compat code & bumped requirements for the impending release.

Author: toastdriven

README.rst

@@ -3,7 +3,7 @@ Haystack
 ========
 
 :author: Daniel Lindsley
-:date: 2010/03/20
+:date: 2011/05/02
 
 Haystack provides modular search for Django. It features a unified, familiar
 API that allows you to plug in different search backends (such as Solr_,
@@ -32,6 +32,7 @@ Documentation
 =============
 
 * Development version: http://docs.haystacksearch.org/dev/
+* v1.1: http://docs.haystacksearch.org/1.1/
 * v1.0: http://docs.haystacksearch.org/1.0/
 
 
@@ -40,8 +41,8 @@ Requirements
 
 Haystack has a relatively easily-met set of requirements.
 
-* Python 2.4+ (may work on 2.3 but untested)
-* Django 1.0+
+* Python 2.5+
+* Django 1.2+
 
 Additionally, each backend has its own requirements. You should refer to
 http://docs.haystacksearch.org/dev/installing_search_engines.html for more

haystack/backends/__init__.py

@@ -10,10 +10,6 @@
 from haystack.constants import DJANGO_CT, VALID_FILTERS, FILTER_SEPARATOR
 from haystack.exceptions import SearchBackendError, MoreLikeThisError, FacetingError
 from haystack.models import SearchResult
-try:
-    set
-except NameError:
-    from sets import Set as set
 try:
     from django.utils import importlib
 except ImportError:

haystack/backends/solr_backend.py

@@ -8,10 +8,6 @@
 from haystack.exceptions import MissingDependency, MoreLikeThisError
 from haystack.models import SearchResult
 from haystack.utils import get_identifier
-try:
-    set
-except NameError:
-    from sets import Set as set
 try:
     from django.db.models.sql.query import get_proxied_model
 except ImportError:

haystack/backends/whoosh_backend.py

@@ -13,10 +13,6 @@
 from haystack.exceptions import MissingDependency, SearchBackendError
 from haystack.models import SearchResult
 from haystack.utils import get_identifier
-try:
-    set
-except NameError:
-    from sets import Set as set
 try:
     import json
 except ImportError:

haystack/management/commands/update_index.py

@@ -9,10 +9,6 @@
     from django.utils import importlib
 except ImportError:
     from haystack.utils import importlib
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 
 DEFAULT_BATCH_SIZE = getattr(settings, 'HAYSTACK_BATCH_SIZE', 1000)

haystack/utils/__init__.py

@@ -1,10 +1,6 @@
 import re
 from django.utils.html import strip_tags
 from haystack.constants import ID, DJANGO_CT, DJANGO_ID
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 
 IDENTIFIER_REGEX = re.compile('^[\w\d_]+\.[\w\d_]+\.\d+$')

tests/core/tests/query.py

@@ -13,10 +13,6 @@
 from haystack.sites import SearchSite
 from core.models import MockModel, AnotherMockModel, CharPKMockModel
 from core.tests.mocks import MockSearchQuery, MockSearchBackend, CharPKMockSearchBackend, MixedMockSearchBackend, MOCK_SEARCH_RESULTS
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 test_pickling = True
 

tests/solr_tests/tests/solr_backend.py

@@ -12,10 +12,6 @@
 from haystack.sites import SearchSite
 from core.models import MockModel, AnotherMockModel, AFourthMockModel
 from core.tests.mocks import MockSearchResult
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 test_pickling = True
 

tests/solr_tests/tests/templatetags.py

@@ -6,10 +6,6 @@
 from haystack.backends.solr_backend import SearchBackend
 from haystack.sites import SearchSite
 from core.models import MockModel
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 
 class MLTSearchIndex(RealTimeSearchIndex):

tests/whoosh_tests/tests/whoosh_backend.py

@@ -14,10 +14,6 @@
 from haystack.sites import SearchSite
 from core.models import MockModel, AnotherMockModel, AFourthMockModel
 from core.tests.mocks import MockSearchResult
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 
 class WhooshMockSearchIndex(indexes.SearchIndex):