it shell work with this patch attached: Patch: Index: stuff/branches/magic-removal/json.py =================================================================== --- stuff/branches/magic-removal/json.py (revision 1002) +++ stuff/branches/magic-removal/json.py (working copy) @@ -2,7 +2,7 @@ import types import re
-from django.conf.settings import DEFAULT_CHARSET +from django.conf import settings ## json.py implements a JSON (http://json.org) reader and writer. ## Copyright (C) 2005 Patrick D. Logan @@ -301,7 +301,7 @@ obj = obj.replace('\r', r'\r') obj = obj.replace('\t', r'\t') if ty is types.StringType: - obj = obj.decode(DEFAULT_CHARSET) + obj = obj.decode(settings.DEFAULT_CHARSET) obj = str(ustring_quote(obj)) self._append(obj) self._append('"') Index: stuff/branches/magic-removal/search/utils.py =================================================================== --- stuff/branches/magic-removal/search/utils.py (revision 1002) +++ stuff/branches/magic-removal/search/utils.py (working copy) @@ -3,12 +3,13 @@ deconstructing search queries and mapping them to models. """ try: - from django.conf.settings import SEARCH_DEFINITIONS + from django.conf import settings except ImportError: SEARCH_DEFINITIONS = () -from django.models import get_module -from django.core.meta import Q +#from django.models import get_module +from django.db.models.loading import get_model +from django.db.models import Q from helpers import SearchDefinitionMeta, SearchDefinition @@ -30,7 +31,7 @@ def __init__(self, search_definition): self.search_definition = search_definition (app_label, module_name) = search_definition.model_module.split('.') - self.model_module = get_module(app_label, module_name) + self.model_module = get_model(app_label, module_name) self.search_fields = search_definition.search_fields self.lookup_filters = {} self.result_filters = {} @@ -117,7 +118,7 @@ if not objectids: return [] - res = self.model_module.get_in_bulk(objectids.keys(), select_related=True).values() + res = self.model_module.objects.select_related().in_bulk(objectids.keys()).values() f = self.search_definition.time_order_by res.sort(lambda a,b: -1*cmp(getattr(a, f),getattr(b, f))) @@ -141,7 +142,7 @@ """ if module_list is None: - module_list = SEARCH_DEFINITIONS + module_list = settings.SEARCH_DEFINITIONS classes = [] Index: stuff/branches/magic-removal/utils.py =================================================================== --- stuff/branches/magic-removal/utils.py (revision 1002) +++ stuff/branches/magic-removal/utils.py (working copy) @@ -2,7 +2,7 @@ Simple and handy utility functions. """ -from django.models.core import sites +from django.contrib.sites.models import Site from django.core.template.defaultfilters import slugify from stuff.latin1 import latin1_to_ascii @@ -53,6 +53,6 @@ global current_site if current_site is not None: return current_site - current_site = sites.get_current() + current_site = Site.objects.get_current() return current_site --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django users" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/django-users -~----------~----~----~----~------~----~------~--~---
