Fix binary file check

lib/galaxy/util/__init__.py

@@ -65,7 +65,7 @@
 gzip_magic = b'\x1f\x8b'
 bz2_magic = b'BZh'
 DEFAULT_ENCODING = os.environ.get('GALAXY_DEFAULT_ENCODING', 'utf-8')
-NULL_CHAR = '\000'
+NULL_CHAR = b'\000'
 BINARY_CHARS = [NULL_CHAR]
 FILENAME_VALID_CHARS = '.,^_-()[]0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 

lib/galaxy/util/checkers.py

@@ -4,7 +4,7 @@
 import tarfile
 import zipfile
 
-from six import StringIO
+from six import BytesIO
 from six.moves import filter
 
 from galaxy import util
@@ -39,6 +39,7 @@ def check_html(file_path, chunk=None):
     # TODO: Potentially reading huge lines into string here, this should be
     # reworked.
     for line in temp:
+        line = util.unicodify(line)
         lineno += 1
         matches = regexp1.search(line) or regexp2.search(line) or regexp3.search(line) or regexp4.search(line) or regexp5.search(line)
         if matches:
@@ -55,9 +56,9 @@ def check_html(file_path, chunk=None):
 def check_binary(name, file_path=True):
     # Handles files if file_path is True or text if file_path is False
     if file_path:
-        temp = open(name, "U")
+        temp = open(name, "rb")
     else:
-        temp = StringIO(name)
+        temp = BytesIO(name)
     try:
         return util.is_binary(temp.read(1024))
     finally: