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

Changed the call arguments for submission tool conversion from XML to v3 text to match those of the standalone tool. Fixes an issue where <sourecode> would have line ends stripped when converted by the datatracker.

Browse source 
- Legacy-Id: 17021
This commit is contained in:
Henrik Levkowetz 2019-11-12 18:27:01 +00:00
parent 68b0e42e94
commit 98dc8e99f3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/submit/forms.py
View file

@ -182,7 +182,7 @@ class SubmissionBaseUploadForm(forms.Form):
# --- Parse the xml --- # --- Parse the xml ---
try: try:
parser = xml2rfc.XmlRfcParser(str(tfn), quiet=True) parser = xml2rfc.XmlRfcParser(str(tfn), quiet=True)
self.xmltree = parser.parse(normalize=True) self.xmltree = parser.parse(remove_comments=False, quiet=True, add_xmlns=True)
self.xmlroot = self.xmltree.getroot() self.xmlroot = self.xmltree.getroot()
xml_version = self.xmlroot.get('version', '2') xml_version = self.xmlroot.get('version', '2')
except Exception as e: except Exception as e:
@ -224,8 +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, liberal=True) prep = xml2rfc.PrepToolWriter(self.xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET])
prep.options.accept_prepped = 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)