| Previous changeset 37:884ccb07885b (2013-11-20) Next changeset 39:e56023008e36 (2015-07-06) |
|
Commit message:
Changed simplejson to json |
|
modified:
lib/galaxy/datatypes/wsf.py |
| b |
| diff -r 884ccb07885b -r 9d0b1fa77047 lib/galaxy/datatypes/wsf.py --- a/lib/galaxy/datatypes/wsf.py Wed Nov 20 16:43:43 2013 -0500 +++ b/lib/galaxy/datatypes/wsf.py Fri Feb 28 12:15:32 2014 -0500 |
| b |
| @@ -5,7 +5,7 @@ import galaxy.datatypes.data import tempfile import os -import simplejson +import json from galaxy import util from galaxy.datatypes.sniff import * from galaxy.datatypes.tabular import Tabular @@ -70,8 +70,8 @@ def _decode_dataset_comments( self ): dataset_comment_string = str( self.dataset_comments ) try: - self._comment_metadata = simplejson.loads( dataset_comment_string ) - except simplejson.JSONDecodeError as e: + self._comment_metadata = json.loads( dataset_comment_string ) + except json.JSONDecodeError as e: pass @property |