From 4e6db789528de72e72e4a32b98beeecc157ad375 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Fri, 7 Feb 2014 09:18:33 -0500 Subject: [PATCH] Try import django.utils.simplejson, except import json --- compressor/cache.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compressor/cache.py b/compressor/cache.py index 4847939..00eb914 100644 --- a/compressor/cache.py +++ b/compressor/cache.py @@ -1,4 +1,3 @@ -import json import hashlib import os import socket @@ -10,6 +9,11 @@ from django.utils.encoding import force_text, smart_bytes from django.utils.functional import SimpleLazyObject from django.utils.importlib import import_module +try: + import django.utils.simplejson as json +except ImportError: + import json + from compressor.conf import settings from compressor.storage import default_storage from compressor.utils import get_mod_func