Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removed simplejson as we only support 2.6+

Change-Id: I7c1d8ce0d0cd9f0bb6b8544f9a6c554be6612fc7
Reviewed-on: http://review.couchbase.org/19286
Reviewed-by: Volker Mische <volker.mische@gmail.com>
Tested-by: Benjamin Young <benjamin@couchbase.com>
  • Loading branch information...
commit 0285a5ddb773b5b434219b3c675a447b49f5fe87 1 parent 23d47a1
@BigBlueHat BigBlueHat authored BigBlueHat committed
View
5 cluster_connect
@@ -1,9 +1,6 @@
#!/usr/bin/env python
import os, sys, getopt, urllib2, urllib
-try:
- import json
-except:
- import simplejson as json
+import json
from urllib2 import HTTPError
View
5 couchbase/client.py
@@ -16,10 +16,7 @@
#
import uuid
-try:
- import json
-except ImportError:
- import simplejson as json
+import json
import time
from copy import deepcopy
from threading import Thread, Lock
View
5 couchbase/couchbaseclient.py
@@ -22,10 +22,7 @@
import zlib
import urllib
import warnings
-try:
- import json
-except ImportError:
- import simplejson as json
+import json
from copy import deepcopy
from couchbase.logger import logger
View
5 couchbase/rest_client.py
@@ -16,10 +16,7 @@
#
import base64
-try:
- import json
-except ImportError:
- import simplejson as json
+import json
import urllib
import socket
import time
View
5 couchbase/tests/test_restclient.py
@@ -19,10 +19,7 @@
import unittest2 as unittest
except ImportError:
import unittest
-try:
- import json
-except ImportError:
- import simplejson as json
+import json
import uuid
import base64
import warnings
View
2  setup.py
@@ -34,7 +34,7 @@
author="Couchbase, Inc.",
author_email="info@couchbase.com",
packages=["couchbase", "couchbase/utils", "couchbase/migrator"],
- install_requires=["httplib2", "requests", "unittest2", "simplejson", "uuid"],
+ install_requires=["httplib2", "requests", "unittest2", "uuid"],
setup_requires=["nose>=1.0"],
tests_require=["nose-testconfig"],
url="http://www.couchbase.com/develop/python/next",
Please sign in to comment.
Something went wrong with that request. Please try again.