From b6d97172236062b60777891b5bfd072ff655602f Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Fri, 11 Jul 2014 01:37:57 -0400
Subject: [PATCH] Remove last usage of Django's simplejson library

---
 mayan/apps/acls/views.py                              | 2 +-
 mayan/apps/common/templatetags/multiselect_tags.py    | 8 +++++---
 mayan/apps/permissions/views.py                       | 2 +-
 mayan/apps/sources/management/commands/bulk_upload.py | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py
index a0a0483c50..d3dedbc0fd 100644
--- a/mayan/apps/acls/views.py
+++ b/mayan/apps/acls/views.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import logging
+from json import loads
 
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
@@ -10,7 +11,6 @@ from django.http import HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.utils.http import urlencode
-from django.utils.simplejson import loads
 from django.utils.translation import ugettext_lazy as _
 
 from common.utils import encapsulate
diff --git a/mayan/apps/common/templatetags/multiselect_tags.py b/mayan/apps/common/templatetags/multiselect_tags.py
index 27801f0d93..5ed52b30a7 100644
--- a/mayan/apps/common/templatetags/multiselect_tags.py
+++ b/mayan/apps/common/templatetags/multiselect_tags.py
@@ -1,7 +1,9 @@
-from django.template import Library
-from django.utils.simplejson import dumps
+from __future__ import absolute_import
 
-from common.utils import return_attrib
+from json import dumps
+from django.template import Library
+
+from ..utils import return_attrib
 
 register = Library()
 
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index df54f9e2c7..39d498fec2 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import itertools
+from json import loads
 import operator
 
 from django.contrib import messages
@@ -10,7 +11,6 @@ from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.utils.simplejson import loads
 from django.utils.translation import ugettext_lazy as _
 
 from acls.classes import EncapsulatedObject
diff --git a/mayan/apps/sources/management/commands/bulk_upload.py b/mayan/apps/sources/management/commands/bulk_upload.py
index 97a415ab34..88e127c9af 100644
--- a/mayan/apps/sources/management/commands/bulk_upload.py
+++ b/mayan/apps/sources/management/commands/bulk_upload.py
@@ -1,11 +1,11 @@
 from __future__ import absolute_import
 
+from json import loads
 from optparse import make_option
 import os
 import sys
 
 from django.core.management.base import CommandError, LabelCommand
-from django.utils.simplejson import loads
 
 from documents.models import DocumentType
 from metadata.api import convert_dict_to_dict_list