# HG changeset patch
# User Richard Burhans <burhans@bx.psu.edu>
# Date 1393607732 18000
# Node ID 9d0b1fa77047980e211ba8d4523fcea68a37f0ad
# Parent  884ccb07885bedd74f86a1cab3379caef232d58a
Changed simplejson to json

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
@@ -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