From c1558e82056658388bf3bfe0141b473700e3ab9c Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 10 Jan 2014 07:42:58 -0500 Subject: [PATCH] One more simplejson/json fix that slipped through the merge. --- lib/tool_shed/scripts/api/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tool_shed/scripts/api/common.py b/lib/tool_shed/scripts/api/common.py index 460f2711078..6e26e7ab15e 100644 --- a/lib/tool_shed/scripts/api/common.py +++ b/lib/tool_shed/scripts/api/common.py @@ -154,7 +154,7 @@ def json_from_url( url ): url_handle = urllib.urlopen( url ) url_contents = url_handle.read() try: - parsed_json = simplejson.loads( url_contents ) + parsed_json = json.loads( url_contents ) except Exception, e: error_message = str( url_contents ) print 'Error parsing JSON data in json_from_url(): ', str( e )