Skip to content

Use json rather than simplejson #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hellosteadman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use json rather than simplejson #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions haystack_cloudsearch/cloudsearch_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@

from django.core.exceptions import ImproperlyConfigured
from django.db.models.loading import get_model
from django.utils import simplejson

import haystack
from haystack.backends import BaseEngine, BaseSearchBackend, BaseSearchQuery
from haystack.exceptions import MissingDependency
from haystack.models import SearchResult
from haystack.utils import get_identifier

import json

from haystack_cloudsearch.cloudsearch_utils import (ID, DJANGO_CT, DJANGO_ID,
gen_version,
Expand Down Expand Up @@ -93,7 +92,7 @@ def setup(self):
ideal_schema = self.build_schema(index.fields)
if not should_build_schema:
# load the schema as a python data type to compare to the idealized schema
schema = simplejson.loads(simplejson.dumps([d['options'] for d in description]))
schema = json.loads(json.dumps([d['options'] for d in description]))
key = lambda x: x[u'index_field_name']
if [x for x in sorted(schema, key=key)] != [x for x in sorted(ideal_schema, key=key)]:
self.setup_complete = False
Expand Down