Skip to content

Commit 1c12b29

Browse files
committed
Fixed a misleading error message given when disallowed character occurs in a draft filename.
- Legacy-Id: 4946
1 parent c847ba2 commit 1c12b29

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

ietf/submit/parsers/plain_parser.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,12 @@ def parse_filename(self):
5555
filename = re.sub('\.txt$', '', filename)
5656
extra_chars = re.sub('[0-9a-z\-]', '', filename)
5757
if extra_chars:
58-
self.parsed_info.add_error(u'Filename contains non alpha-numeric character: %s' % (', '.join(set(extra_chars))).decode('ascii','replace'))
58+
if len(extra_chars) == 1:
59+
self.parsed_info.add_error((u'The filename contains a disallowed character: %s ' % (', '.join(set(extra_chars))).decode('ascii','replace')) +
60+
u'(see http://www.ietf.org/id-info/guidelines.html#naming for details).')
61+
else:
62+
self.parsed_info.add_error((u'The filename contains disallowed characters: %s ' % (', '.join(set(extra_chars))).decode('ascii','replace')) +
63+
u'(see http://www.ietf.org/id-info/guidelines.html#naming for details).')
5964
match_revision = revisionre.match(filename)
6065
if match_revision:
6166
self.parsed_info.metadraft.revision = match_revision.group(1)

0 commit comments

Comments
 (0)