altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Be more liberal with v3 xml submissions.

Browse source 
- Legacy-Id: 16956
This commit is contained in:
Henrik Levkowetz 2019-11-04 18:13:22 +00:00
parent d5b6292060
commit bf299bbfb5
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/submit/forms.py
View file

@ -224,7 +224,8 @@ class SubmissionBaseUploadForm(forms.Form):
file_name['xml'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (self.filename, self.revision, ext)) file_name['xml'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (self.filename, self.revision, ext))
try: try:
if xml_version == '3': if xml_version == '3':
prep = xml2rfc.PrepToolWriter(self.xmltree, quiet=True) prep = xml2rfc.PrepToolWriter(self.xmltree, quiet=True, liberal=True)
prep.options.accept_prepped = True
self.xmltree.tree = prep.prep() self.xmltree.tree = prep.prep()
if self.xmltree.tree == None: if self.xmltree.tree == None:
raise forms.ValidationError("Error from xml2rfc (prep): %s" % prep.errors) raise forms.ValidationError("Error from xml2rfc (prep): %s" % prep.errors)
@ -241,6 +242,7 @@ class SubmissionBaseUploadForm(forms.Form):
pagedwriter.write(file_name['txt']) pagedwriter.write(file_name['txt'])
else: else:
writer = xml2rfc.TextWriter(self.xmltree, quiet=True) writer = xml2rfc.TextWriter(self.xmltree, quiet=True)
writer.options.accept_prepped = True
writer.write(file_name['txt']) writer.write(file_name['txt'])
log.log("In %s: xml2rfc %s generated %s from %s (version %s)" % log.log("In %s: xml2rfc %s generated %s from %s (version %s)" %
( os.path.dirname(file_name['xml']), ( os.path.dirname(file_name['xml']),