Skip to content
This repository was archived by the owner on Aug 13, 2026. It is now read-only.

Invert json lib preference for master #190

Merged
seancribbs merged 2 commits into from
Jan 31, 2013
Merged

Invert json lib preference for master #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a10e0f
prefer simplejson when available
evanmcc Jan 28, 2013
167c4da
also update transport imports
evanmcc Jan 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion riak/client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
under the License.
"""

import json
try:
import simplejson as json
except ImportError:
import json

import random
from weakref import WeakValueDictionary
from riak.client.operations import RiakClientOperations
Expand Down
5 changes: 4 additions & 1 deletion riak/tests/test_kv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
import os
import cPickle
import copy
import json
try:
import simplejson as json
except ImportError:
import json


class NotJsonSerializable(object):
Expand Down
6 changes: 5 additions & 1 deletion riak/transports/http/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
under the License.
"""

import json
try:
import simplejson as json
except ImportError:
import json

import urllib
import re
import csv
Expand Down