Corrected the extent of a try/except block, moving more code inside the block. Fixes a submission exception that should just be a document error reported back to the user.

 - Legacy-Id: 17411

Author: levkowetz

ietf/submit/forms.py

@@ -317,22 +317,22 @@ def format_messages(where, e, log):
             txt_file.seek(0)
             try:
                 text = bytes.decode(self.file_info['txt'].charset)
+            #
+                self.parsed_draft = Draft(text, txt_file.name)
+                if self.filename == None:
+                    self.filename = self.parsed_draft.filename
+                elif self.filename != self.parsed_draft.filename:
+                    self.add_error('txt', "Inconsistent name information: xml:%s, txt:%s" % (self.filename, self.parsed_draft.filename))
+                if self.revision == None:
+                    self.revision = self.parsed_draft.revision
+                elif self.revision != self.parsed_draft.revision:
+                    self.add_error('txt', "Inconsistent revision information: xml:%s, txt:%s" % (self.revision, self.parsed_draft.revision))
+                if self.title == None:
+                    self.title = self.parsed_draft.get_title()
+                elif self.title != self.parsed_draft.get_title():
+                    self.add_error('txt', "Inconsistent title information: xml:%s, txt:%s" % (self.title, self.parsed_draft.get_title()))
             except (UnicodeDecodeError, LookupError) as e:
                 self.add_error('txt', 'Failed decoding the uploaded file: "%s"' % str(e))
-            #
-            self.parsed_draft = Draft(text, txt_file.name)
-            if self.filename == None:
-                self.filename = self.parsed_draft.filename
-            elif self.filename != self.parsed_draft.filename:
-                self.add_error('txt', "Inconsistent name information: xml:%s, txt:%s" % (self.filename, self.parsed_draft.filename))
-            if self.revision == None:
-                self.revision = self.parsed_draft.revision
-            elif self.revision != self.parsed_draft.revision:
-                self.add_error('txt', "Inconsistent revision information: xml:%s, txt:%s" % (self.revision, self.parsed_draft.revision))
-            if self.title == None:
-                self.title = self.parsed_draft.get_title()
-            elif self.title != self.parsed_draft.get_title():
-                self.add_error('txt', "Inconsistent title information: xml:%s, txt:%s" % (self.title, self.parsed_draft.get_title()))
 
         # The following errors are likely noise if we have previous field
         # errors: