Merge pull request #6510 from nsoranzo/release_18.05_backport_29f8e29b0bf5d50c0b735aa707d2a61623cc805b

[18.05] Fix infinite loop in uploads

lib/galaxy/datatypes/proteomics.py

@@ -393,8 +393,10 @@ class Ms2(Text):
         header_lines = []
         while True:
             line = contents.readline()
-            if line is None or len(line) == 0:
-                pass
+            if not line:
+                return False
+            if line.strip() == "":
+                continue
             elif line.startswith('H\t'):
                 header_lines.append(line)
             else:

lib/galaxy/datatypes/sniff.py

@@ -290,6 +290,9 @@ def guess_ext(fname, sniff_order, is_binary=False):
     >>> from galaxy.datatypes.registry import example_datatype_registry_for_sample
     >>> datatypes_registry = example_datatype_registry_for_sample()
     >>> sniff_order = datatypes_registry.sniff_order
+    >>> fname = get_test_fname('empty.txt')
+    >>> guess_ext(fname, sniff_order)
+    'txt'
     >>> fname = get_test_fname('megablast_xml_parser_test1.blastxml')
     >>> guess_ext(fname, sniff_order)
     'blastxml'