diff --git a/q2_types/feature_data/_format.py b/q2_types/feature_data/_format.py index dd907afe..36def3ea 100644 --- a/q2_types/feature_data/_format.py +++ b/q2_types/feature_data/_format.py @@ -150,8 +150,8 @@ def _validate_lines(self, max_lines): return if first[0] != ord(b'>'): raise ValidationError("First line of file is not a valid " - "refline. reflines must start with " - "'>'") + "description. Descriptions must " + "start with '>'") fh.seek(0) for line_number, line in enumerate(fh, 1): if line_number >= max_lines: @@ -160,13 +160,13 @@ def _validate_lines(self, max_lines): if line.startswith('>'): if last_line_was_ID: raise ValidationError('Multiple consecutive ' - 'reflines starting on line ' - f'{line_number-1!r}') + 'descriptions starting on ' + f'line {line_number-1!r}') line = line.split() if line[0] == '>': if len(line) == 1: raise ValidationError( - f'Refline on line {line_number} is ' + f'Description on line {line_number} is ' 'missing an ID.') else: raise ValidationError( diff --git a/q2_types/feature_data/tests/test_format.py b/q2_types/feature_data/tests/test_format.py index 5ffc1567..809f5115 100644 --- a/q2_types/feature_data/tests/test_format.py +++ b/q2_types/feature_data/tests/test_format.py @@ -170,7 +170,7 @@ def test_dna_fasta_format_consecutive_IDs(self): format = DNAFASTAFormat(filepath, mode='r') with self.assertRaisesRegex( - ValidationError, 'consecutive reflines.*1'): + ValidationError, 'consecutive descriptions.*1'): format.validate() def test_dna_fasta_format_missing_initial_ID(self):