From 762a52edde09297e87c640797219c9bb8255d50a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 25 Apr 2011 04:50:28 +0100
Subject: Fix some compat issues with json/simplejson

---
 examples/pygments_api/tests.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'examples/pygments_api/tests.py')

diff --git a/examples/pygments_api/tests.py b/examples/pygments_api/tests.py
index 017823b9..a8f085cf 100644
--- a/examples/pygments_api/tests.py
+++ b/examples/pygments_api/tests.py
@@ -1,12 +1,12 @@
 from django.test import TestCase
+from django.utils import simplejson as json
+
 from djangorestframework.compat import RequestFactory
+
 from pygments_api import views
 import tempfile, shutil
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
+
 
 class TestPygmentsExample(TestCase):
 
-- 
cgit v1.2.3


From 5a59f339c1757767b136de33faa5b67a972141a1 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 27 Apr 2011 18:44:21 +0100
Subject: Urg.  Fixing broken merge

---
 examples/pygments_api/tests.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'examples/pygments_api/tests.py')

diff --git a/examples/pygments_api/tests.py b/examples/pygments_api/tests.py
index 766defc3..6eb69da5 100644
--- a/examples/pygments_api/tests.py
+++ b/examples/pygments_api/tests.py
@@ -1,18 +1,12 @@
 from django.test import TestCase
 from django.utils import simplejson as json
-<<<<<<< local
 
-=======
->>>>>>> other
 from djangorestframework.compat import RequestFactory
 
 from pygments_api import views
 import tempfile, shutil
 
-<<<<<<< local
 
-=======
->>>>>>> other
 
 class TestPygmentsExample(TestCase):
 
-- 
cgit v1.2.3