|
1 | | -# Copyright The IETF Trust 2011-2019, All Rights Reserved |
| 1 | +# Copyright The IETF Trust 2011-2020, All Rights Reserved |
2 | 2 |
|
3 | 3 |
|
4 | 4 | from __future__ import absolute_import, print_function, unicode_literals |
@@ -58,16 +58,16 @@ def parse_name(self): |
58 | 58 | extra_chars = re.sub(r'[0-9a-z\-]', '', name) |
59 | 59 | if extra_chars: |
60 | 60 | if len(extra_chars) == 1: |
61 | | - self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name.decode('utf-8','replace'), ord(extra_chars[0]))) + |
| 61 | + self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name, ord(extra_chars[0]))) + |
62 | 62 | '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') |
63 | 63 | else: |
64 | | - self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name.decode('utf-8','replace'), (', '.join([ str(ord(c)) for c in extra_chars] )))) + |
| 64 | + self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name, (', '.join([ str(ord(c)) for c in extra_chars] )))) + |
65 | 65 | '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') |
66 | 66 | match_revision = revisionre.match(name) |
67 | 67 | if match_revision: |
68 | 68 | self.parsed_info.metadata.rev = match_revision.group(1) |
69 | 69 | else: |
70 | | - self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name.decode('utf-8','replace'),)) |
| 70 | + self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name,)) |
71 | 71 | name = re.sub(r'-\d+$', '', name) |
72 | 72 | self.parsed_info.metadata.name = name |
73 | 73 | return |
|
0 commit comments