travis test correction

galaxyproject · Jul 6, 2017 · dac7295 · dac7295
1 parent 731d1db
commit dac7295
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
@@ -487,10 +487,10 @@ def get_chunk( self, trans, dataset, offset=0, ck_size=None ):
                     break
                 else:
                     bamline = alignment.tostring( bamfile )
-                    # Galaxy display each tag as separate column because 'tostring()' funcition put spaces in between each tag of tags column. 
-                    # Below code will remove spaces between each tag. 
+                    # Galaxy display each tag as separate column because 'tostring()' funcition put spaces in between each tag of tags column.
+                    # Below code will remove spaces between each tag.
                     bamline_modified = ('\t').join( bamline.split()[:11] + [ ('').join(bamline.split()[11:]) ] )
-                    ck_data = ck_data +"\n" + bamline_modified
+                    ck_data = ck_data + "\n" + bamline_modified
                 last_read = bamfile.tell()
         return dumps( { 'ck_data': util.unicodify( ck_data ),
                         'offset': last_read } )

diff --git a/lib/galaxy/datatypes/sniff.py b/lib/galaxy/datatypes/sniff.py
@@ -17,7 +17,7 @@
 from six import text_type
 
 from galaxy import util
-from galaxy.datatypes.binary import Binary
+from galaxy import datatypes
 from galaxy.util import (
     compression_utils,
     multi_byte,
@@ -487,7 +487,7 @@ def handle_uploaded_dataset_file( filename, datatypes_registry, ext='auto', is_m
         ext = guess_ext( filename, sniff_order=datatypes_registry.sniff_order, is_multi_byte=is_multi_byte )
 
     if check_binary( filename ):
-        if not galaxy.datatypes.binary.is_ext_unsniffable(ext) and not datatypes_registry.get_datatype_by_extension( ext ).sniff( filename ):
+        if not datatypes.binary.Binary.is_ext_unsniffable(ext) and not datatypes_registry.get_datatype_by_extension( ext ).sniff( filename ):
             raise InappropriateDatasetContentError( 'The binary uploaded file contains inappropriate content.' )
     elif check_html( filename ):
         raise InappropriateDatasetContentError( 'The uploaded file contains inappropriate HTML content.' )