# HG changeset patch
# User iuc
# Date 1406533597 14400
# Node ID 1b9f420e6f69e5beac65189e1c1fcf9a0dbfea7f
# Parent  a37d92dc7fd2dfe10ee392a90b95081cd3a85b34
Uploaded

diff -r a37d92dc7fd2 -r 1b9f420e6f69 datatypes_conf.xml
--- a/datatypes_conf.xml	Mon Jul 28 03:38:39 2014 -0400
+++ b/datatypes_conf.xml	Mon Jul 28 03:46:37 2014 -0400
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
   <datatypes>
    <datatype_files>
-     <datatype_file name="json.py"/>
+     <datatype_file name="json_datatyp.py"/>
    </datatype_files>
    <registration>
-        <datatype extension="json" type="galaxy.datatypes.json:Json" display_in_upload="True" />
+        <datatype extension="json" type="galaxy.datatypes.json_datatyp:Json" display_in_upload="True" />
    </registration>
    <sniffers>
-        <sniffer type="galaxy.datatypes.json:Json"/>
+        <sniffer type="galaxy.datatypes.json_datatyp:Json"/>
    </sniffers>
 </datatypes>
diff -r a37d92dc7fd2 -r 1b9f420e6f69 json.py
--- a/json.py	Mon Jul 28 03:38:39 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from galaxy.datatypes.data import Text
-from galaxy.datatypes.data import get_file_peek
-import json
-import os
-
-class Json( Text ):
-    file_ext = "json"
-
-    def set_peek( self, dataset, is_multi_byte=False ):
-        if not dataset.dataset.purged:
-            dataset.peek = get_file_peek( dataset.file_name, is_multi_byte=is_multi_byte )
-            dataset.blurb = "JavaScript Object Notation (JSON)"
-        else:
-            dataset.peek = 'file does not exist'
-            dataset.blurb = 'file purged from disc'
-
-    def sniff( self, filename ):
-        """
-            Try to load the string with the json module. If successful it's a json file.
-        """
-        try:
-            json.load( open(filename) )
-            return True
-        except:
-            return True
-
-    def set_meta( self, dataset, **kwd ):
-        """
-
-        Set the number of models in dataset.
-        """
-        pass
-
-
diff -r a37d92dc7fd2 -r 1b9f420e6f69 json_datatyp.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/json_datatyp.py	Mon Jul 28 03:46:37 2014 -0400
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+from galaxy.datatypes.data import Text
+from galaxy.datatypes.data import get_file_peek
+import json
+import os
+
+class Json( Text ):
+    file_ext = "json"
+
+    def set_peek( self, dataset, is_multi_byte=False ):
+        if not dataset.dataset.purged:
+            dataset.peek = get_file_peek( dataset.file_name, is_multi_byte=is_multi_byte )
+            dataset.blurb = "JavaScript Object Notation (JSON)"
+        else:
+            dataset.peek = 'file does not exist'
+            dataset.blurb = 'file purged from disc'
+
+    def sniff( self, filename ):
+        """
+            Try to load the string with the json module. If successful it's a json file.
+        """
+        try:
+            json.load( open(filename) )
+            return True
+        except:
+            return True
+
+    def set_meta( self, dataset, **kwd ):
+        """
+
+        Set the number of models in dataset.
+        """
+        pass
+
+