From 560c0a029f0f5cd2efc254786ca392f91dc80f19 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 24 Aug 2015 14:37:08 -0300
Subject: [refactor] remove simplejson dependency on common

---
 common/pkg/requirements.pip                                         | 1 -
 common/src/leap/soledad/common/couch.py                             | 2 +-
 common/src/leap/soledad/common/tests/test_sqlcipher_sync.py         | 2 +-
 common/src/leap/soledad/common/tests/test_sync_target.py            | 2 +-
 common/src/leap/soledad/common/tests/u1db_tests/README              | 1 -
 common/src/leap/soledad/common/tests/u1db_tests/__init__.py         | 6 +-----
 common/src/leap/soledad/common/tests/u1db_tests/test_backends.py    | 5 +----
 common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py | 5 +----
 .../src/leap/soledad/common/tests/u1db_tests/test_http_database.py  | 5 +----
 9 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'common')

diff --git a/common/pkg/requirements.pip b/common/pkg/requirements.pip
index 287741d2..a1238707 100644
--- a/common/pkg/requirements.pip
+++ b/common/pkg/requirements.pip
@@ -1,4 +1,3 @@
-simplejson
 u1db
 
 # XXX -- fix me!
diff --git a/common/src/leap/soledad/common/couch.py b/common/src/leap/soledad/common/couch.py
index 1747d067..6c28e0be 100644
--- a/common/src/leap/soledad/common/couch.py
+++ b/common/src/leap/soledad/common/couch.py
@@ -19,7 +19,7 @@
 """A U1DB backend that uses CouchDB as its persistence layer."""
 
 
-import simplejson as json
+import json
 import re
 import uuid
 import logging
diff --git a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
index 9f9083af..c57d6f61 100644
--- a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
+++ b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
@@ -19,7 +19,7 @@ Test sqlcipher backend sync.
 """
 
 
-import simplejson as json
+import json
 
 from u1db import sync
 from u1db import vectorclock
diff --git a/common/src/leap/soledad/common/tests/test_sync_target.py b/common/src/leap/soledad/common/tests/test_sync_target.py
index 1d36edf0..c7f2eb5c 100644
--- a/common/src/leap/soledad/common/tests/test_sync_target.py
+++ b/common/src/leap/soledad/common/tests/test_sync_target.py
@@ -20,7 +20,7 @@ Test Leap backend bits: sync target
 import cStringIO
 import os
 import time
-import simplejson as json
+import json
 import u1db
 import random
 import string
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/README b/common/src/leap/soledad/common/tests/u1db_tests/README
index d543f250..0525cfdb 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/README
+++ b/common/src/leap/soledad/common/tests/u1db_tests/README
@@ -22,5 +22,4 @@ u1db tests depend on the following python packages:
   dirspec
   paste
   routes
-  simplejson
   cython
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/__init__.py b/common/src/leap/soledad/common/tests/u1db_tests/__init__.py
index 051277b2..01da9381 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/__init__.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/__init__.py
@@ -22,11 +22,7 @@ import shutil
 import socket
 import tempfile
 import threading
-
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import json
 
 from wsgiref import simple_server
 
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py b/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py
index 0129426e..410d838f 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_backends.py
@@ -16,10 +16,7 @@
 
 """The backend class for U1DB. This deals with hiding storage details."""
 
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import json
 
 from u1db import DocumentBase
 from u1db import errors
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py b/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py
index f9e09cbd..973c3b26 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py
@@ -17,10 +17,7 @@
 """Tests for HTTPDatabase"""
 
 from oauth import oauth
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import json
 
 from u1db import (
     errors,
diff --git a/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py b/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py
index be6c1000..015e6e69 100644
--- a/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py
+++ b/common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py
@@ -17,10 +17,7 @@
 """Tests for HTTPDatabase"""
 
 import inspect
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import json
 
 from unittest import skip
 
-- 
cgit v1.2.3