3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/701c01f794e2/ Changeset: 701c01f794e2 User: dannon Date: 2014-10-13 14:44:11+00:00 Summary: Simplify to_json_string/from_json_string; without the extra logging there's no reason to wrap the functions and pass args Affected #: 1 file diff -r 738cdb119ce34e570224eb87ee7a270caa53f39b -r 701c01f794e2fc6cf5586fde68a0d7a33a161790 lib/galaxy/util/json.py --- a/lib/galaxy/util/json.py +++ b/lib/galaxy/util/json.py @@ -15,13 +15,8 @@ log = logging.getLogger( __name__ ) - -def to_json_string(*args, **kwargs): - return json.dumps(*args, **kwargs) - - -def from_json_string(*args, **kwargs): - return json.loads(*args, **kwargs) +to_json_string = dumps +from_json_string = loads def json_fix( val ): https://bitbucket.org/galaxy/galaxy-central/commits/cce814e5b0fe/ Changeset: cce814e5b0fe Branch: docker-work User: dannon Date: 2014-10-13 15:24:21+00:00 Summary: Branch prune. Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/be638dd2f087/ Changeset: be638dd2f087 User: dannon Date: 2014-10-13 15:24:36+00:00 Summary: Merge. Affected #: 1 file diff -r 82ce88b096ffb95246e2b6832454ef64b1b2f477 -r be638dd2f087e895bb611a132999ec8309db0c03 lib/galaxy/util/json.py --- a/lib/galaxy/util/json.py +++ b/lib/galaxy/util/json.py @@ -15,13 +15,8 @@ log = logging.getLogger( __name__ ) - -def to_json_string(*args, **kwargs): - return json.dumps(*args, **kwargs) - - -def from_json_string(*args, **kwargs): - return json.loads(*args, **kwargs) +to_json_string = dumps +from_json_string = loads def json_fix( val ): 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.