1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e9cef9ca217f/ Changeset: e9cef9ca217f User: dannon Date: 2014-07-09 02:57:29 Summary: Merged in christopherbare/galaxy-central/fix_to_data_library_display (pull request #428) use galaxy.util.json rather than json from the python libraries Affected #: 1 file diff -r f53d750acf557eeb84fa62c4151074c5fe5b7039 -r e9cef9ca217f8801f7efd72e913424c1cd0ded38 lib/galaxy/util/__init__.py --- a/lib/galaxy/util/__init__.py +++ b/lib/galaxy/util/__init__.py @@ -10,7 +10,6 @@ import collections import errno import grp -import json import logging import os import pickle @@ -24,6 +23,8 @@ import tempfile import threading +from galaxy.util import json + from email.MIMEText import MIMEText from os.path import relpath @@ -312,8 +313,8 @@ def pretty_print_json(json_data, is_json_string=False): if is_json_string: - json_data = json.loads(json_data) - return json.dumps(json_data, sort_keys=True, indent=4 * ' ') + json_data = json.from_json_string(json_data) + return json.to_json_string(json_data, sort_keys=True, indent=4) # characters that are valid valid_chars = set(string.letters + string.digits + " -=_.()/+*^,:?!") Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.