Skip to content

Commit 167c4da

Browse files
evanmccSean Cribbs
authored andcommitted
also update transport imports
1 parent 5a10e0f commit 167c4da

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

riak/tests/test_kv.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
import os
33
import cPickle
44
import copy
5-
import json
5+
try:
6+
import simplejson as json
7+
except ImportError:
8+
import json
69

710

811
class NotJsonSerializable(object):

riak/transports/http/transport.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
under the License.
2020
"""
2121

22-
import json
22+
try:
23+
import simplejson as json
24+
except ImportError:
25+
import json
26+
2327
import urllib
2428
import re
2529
import csv

0 commit comments

Comments
 (0)