# HG changeset patch # User iuc # Date 1406533147 14400 # Node ID 8e8555ca07f915aec91d87a2dd614a8f0182f6f5 # Parent 7ae1c661a86cdbc6d86f1b1fb976eb2247e12866 Uploaded diff -r 7ae1c661a86c -r 8e8555ca07f9 datatypes_conf.xml --- a/datatypes_conf.xml Mon Jul 28 03:21:07 2014 -0400 +++ b/datatypes_conf.xml Mon Jul 28 03:39:07 2014 -0400 @@ -7,6 +7,6 @@ - + diff -r 7ae1c661a86c -r 8e8555ca07f9 ipynb.py --- a/ipynb.py Mon Jul 28 03:21:07 2014 -0400 +++ b/ipynb.py Mon Jul 28 03:39:07 2014 -0400 @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -from galaxy.datatypes.json import Json +from galaxy.datatypes.json import Json as JsonClass from galaxy.datatypes.data import get_file_peek import subprocess import tempfile import json import os -class Ipynb( Text ): +class Ipynb( JsonClass ): file_ext = "ipynb" def set_peek( self, dataset, is_multi_byte=False ): @@ -23,8 +23,8 @@ Try to load the string with the json module. If successful it's a json file. """ try: - json.load( filename ) - if a.get('nbformat', False) != False and a.get('metadata', False): + ipynb = json.load( open(filename) ) + if ipynb.get('nbformat', False) != False and ipynb.get('metadata', False): return True else: return False diff -r 7ae1c661a86c -r 8e8555ca07f9 repository_dependencies.xml --- a/repository_dependencies.xml Mon Jul 28 03:21:07 2014 -0400 +++ b/repository_dependencies.xml Mon Jul 28 03:39:07 2014 -0400 @@ -1,4 +1,4 @@ - +