Mercurial > repos > miller-lab > genome_diversity

changeset 38:9d0b1fa77047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed simplejson to json
author Richard Burhans <burhans@bx.psu.edu>
date Fri, 28 Feb 2014 12:15:32 -0500
parents 884ccb07885b
children e56023008e36
files lib/galaxy/datatypes/wsf.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
@@ -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