From 299ce886d87d0243843dbbe77c4e48a87f3f0f31 Mon Sep 17 00:00:00 2001
From: Jason Stephenson <jason@sigio.com>
Date: Mon, 5 Mar 2018 11:13:11 -0500
Subject: [PATCH] Import the simplejson module by itself.

The django.utils.simplejson module was removed in Django 1.7.

Signed-off-by: Jason Stephenson <jason@sigio.com>
---
 conifer/integration/evergreen_example.py | 2 +-
 conifer/integration/uwindsor.py          | 2 +-
 conifer/libsystems/evergreen/support.py  | 2 +-
 conifer/syrup/models.py                  | 2 +-
 conifer/syrup/views/_common.py           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conifer/integration/evergreen_example.py b/conifer/integration/evergreen_example.py
index a07127c..daaa257 100644
--- a/conifer/integration/evergreen_example.py
+++ b/conifer/integration/evergreen_example.py
@@ -4,7 +4,7 @@ import csv
 import subprocess
 from django.conf                          import settings
 from urllib2 import urlopen
-from django.utils import simplejson
+import simplejson
 try:
     from conifer.libsystems.evergreen import opensrf
 except ImportError:
diff --git a/conifer/integration/uwindsor.py b/conifer/integration/uwindsor.py
index 061c929..0a4c478 100644
--- a/conifer/integration/uwindsor.py
+++ b/conifer/integration/uwindsor.py
@@ -6,7 +6,7 @@ import subprocess
 import uwindsor_fuzzy_lookup
 from django.conf                          import settings
 from urllib2 import urlopen
-from django.utils import simplejson
+import simplejson
 
 
 class UWindsorIntegration(EvergreenIntegration):
diff --git a/conifer/libsystems/evergreen/support.py b/conifer/libsystems/evergreen/support.py
index d727ad5..b3a155c 100644
--- a/conifer/libsystems/evergreen/support.py
+++ b/conifer/libsystems/evergreen/support.py
@@ -1,7 +1,7 @@
 import warnings
 import urllib2
 from urllib import quote
-from django.utils import simplejson as json
+import simplejson as json
 from xml.etree import ElementTree
 import re
 import sys, os
diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index e286d2c..5c81f6e 100644
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -11,7 +11,7 @@ from django.conf                     import settings
 from django.contrib.auth.models      import AnonymousUser, User
 from django.db                       import models as m
 from django.db.models                import Q
-from django.utils                    import simplejson as json
+import simplejson as json
 from django.utils.translation        import ugettext as _
 from genshi                          import Markup
 
diff --git a/conifer/syrup/views/_common.py b/conifer/syrup/views/_common.py
index 7f26453..11e8db5 100644
--- a/conifer/syrup/views/_common.py
+++ b/conifer/syrup/views/_common.py
@@ -37,7 +37,7 @@ from django.http                    import (HttpResponse, HttpResponseRedirect,
                                             HttpResponseNotFound,
                                             HttpResponseForbidden)
 from django.shortcuts               import get_object_or_404
-from django.utils                   import simplejson
+import simplejson
 from django.utils                   import translation
 from _generics                      import * # TODO: should not import-star
 
-- 
2.11.0