From 64f32fbc72a327a6cbdd8788579e2c7094c2f7d5 Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Wed, 13 Mar 2013 09:52:51 -0700
Subject: [PATCH] Use python's json rather than Django's

django.utils.simplejson is deprecated; Python 2.6+ includes json.
Fixes #32.
---
 djrill/mail/backends/djrill.py | 3 ++-
 djrill/tests/mock_backend.py   | 3 ++-
 djrill/views.py                | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/djrill/mail/backends/djrill.py b/djrill/mail/backends/djrill.py
index 260b1f3..7a057a9 100644
--- a/djrill/mail/backends/djrill.py
+++ b/djrill/mail/backends/djrill.py
@@ -2,7 +2,6 @@ from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.core.mail.backends.base import BaseEmailBackend
 from django.core.mail.message import sanitize_address, DEFAULT_ATTACHMENT_MIME_TYPE
-from django.utils import simplejson as json
 
 # Oops: this file has the same name as our app, and cannot be renamed.
 #from djrill import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError
@@ -11,11 +10,13 @@ from ... import MANDRILL_API_URL, MandrillAPIError, NotSupportedByMandrillError
 from base64 import b64encode
 from email.mime.base import MIMEBase
 from email.utils import parseaddr
+import json
 import mimetypes
 import requests
 
 DjrillBackendHTTPError = MandrillAPIError # Backwards-compat Djrill<=0.2.0
 
+
 class DjrillBackend(BaseEmailBackend):
     """
     Mandrill API Email Backend
diff --git a/djrill/tests/mock_backend.py b/djrill/tests/mock_backend.py
index 5003250..f697177 100644
--- a/djrill/tests/mock_backend.py
+++ b/djrill/tests/mock_backend.py
@@ -1,8 +1,9 @@
+import json
 from mock import patch
 
 from django.conf import settings
 from django.test import TestCase
-from django.utils import simplejson as json
+
 
 class DjrillBackendMockAPITestCase(TestCase):
     """TestCase that uses Djrill EmailBackend with a mocked Mandrill API"""
diff --git a/djrill/views.py b/djrill/views.py
index 5264119..5f9051e 100644
--- a/djrill/views.py
+++ b/djrill/views.py
@@ -1,8 +1,9 @@
+import json
+
 from django import forms
 from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import simplejson as json
 from django.views.generic import TemplateView
 
 from djrill import MANDRILL_API_URL