From 1c12b295ef13d6578878c0e22e52bceb1e1187ba Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 22 Oct 2012 18:18:49 +0000 Subject: [PATCH] Fixed a misleading error message given when disallowed character occurs in a draft filename. - Legacy-Id: 4946 --- ietf/submit/parsers/plain_parser.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ietf/submit/parsers/plain_parser.py b/ietf/submit/parsers/plain_parser.py index 4aa9438d5..1db738e69 100644 --- a/ietf/submit/parsers/plain_parser.py +++ b/ietf/submit/parsers/plain_parser.py @@ -55,7 +55,12 @@ class PlainParser(FileParser): filename = re.sub('\.txt$', '', filename) extra_chars = re.sub('[0-9a-z\-]', '', filename) if extra_chars: - self.parsed_info.add_error(u'Filename contains non alpha-numeric character: %s' % (', '.join(set(extra_chars))).decode('ascii','replace')) + if len(extra_chars) == 1: + self.parsed_info.add_error((u'The filename contains a disallowed character: %s ' % (', '.join(set(extra_chars))).decode('ascii','replace')) + + u'(see http://www.ietf.org/id-info/guidelines.html#naming for details).') + else: + self.parsed_info.add_error((u'The filename contains disallowed characters: %s ' % (', '.join(set(extra_chars))).decode('ascii','replace')) + + u'(see http://www.ietf.org/id-info/guidelines.html#naming for details).') match_revision = revisionre.match(filename) if match_revision: self.parsed_info.metadraft.revision = match_revision.group(1)