From 69559de3421377e9a7c40b9604c5b944a1f38013 Mon Sep 17 00:00:00 2001
From: Alejandro Cabrera <alejandro.cabrera@rackspace.com>
Date: Fri, 15 Nov 2013 12:48:51 -0500
Subject: [PATCH] refactor: drop simplejson requirement

After much benchmarking, it was decided that it is preferable to
remove the simplejson dependency. This comes with the caveat that json
handling is slower on Python<=2.6, but faster on Python>2.7, including
Python 3 and pypy.

The recommendation moving forward is to deploy Marconi on Python>2.7.

Change-Id: If7a9380bd32023ec973fd2f267255723aaa49306
---
 marconi/queues/transport/utils.py      | 2 +-
 marconi/queues/transport/validation.py | 2 +-
 requirements.txt                       | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/marconi/queues/transport/utils.py b/marconi/queues/transport/utils.py
index 187a6191b..3b388d6ba 100644
--- a/marconi/queues/transport/utils.py
+++ b/marconi/queues/transport/utils.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import simplejson as json
+import json
 
 
 class MalformedJSON(ValueError):
diff --git a/marconi/queues/transport/validation.py b/marconi/queues/transport/validation.py
index 0cf4167e2..c99292db6 100644
--- a/marconi/queues/transport/validation.py
+++ b/marconi/queues/transport/validation.py
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 import re
 
 from oslo.config import cfg
-import simplejson as json
 
 
 _TRANSPORT_LIMITS_OPTIONS = [
diff --git a/requirements.txt b/requirements.txt
index 9fc5819e1..9590b2363 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,6 @@ msgpack-python
 pymongo>=2.4
 python-keystoneclient>=0.3.2
 python-memcached
-simplejson>=2.0.9
 WebOb>=1.2.3,<1.3
 stevedore>=0.10
 six