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

Specified explicit UTF-8 decoding of submission checker output

Browse source 
- Legacy-Id: 17194
This commit is contained in:
Henrik Levkowetz 2020-01-07 22:26:00 +00:00
parent 722a60882a
commit 3db48727ea
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/submit/checkers.py
View file

@ -1,4 +1,4 @@
# Copyright The IETF Trust 2016-2019, All Rights Reserved # Copyright The IETF Trust 2016-2020, All Rights Reserved
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
@ -84,8 +84,8 @@ class DraftIdnitsChecker(object):
cmd = "%s %s %s" % (settings.IDSUBMIT_IDNITS_BINARY, self.options, path) cmd = "%s %s %s" % (settings.IDSUBMIT_IDNITS_BINARY, self.options, path)
code, out, err = pipe(cmd) code, out, err = pipe(cmd)
out = out.decode() out = out.decode('utf-8')
err = err.decode() err = err.decode('utf-8')
if code != 0 or out == "": if code != 0 or out == "":
message = "idnits error: %s:\n Error %s: %s" %( cmd, code, err) message = "idnits error: %s:\n Error %s: %s" %( cmd, code, err)
log(message) log(message)
@ -214,8 +214,8 @@ class DraftYangChecker(object):
cmd_version = VersionInfo.objects.get(command=command).version cmd_version = VersionInfo.objects.get(command=command).version
cmd = cmd_template.format(libs=modpath, model=path) cmd = cmd_template.format(libs=modpath, model=path)
code, out, err = pipe(cmd) code, out, err = pipe(cmd)
out = out.decode() out = out.decode('utf-8')
err = err.decode() err = err.decode('utf-8')
if code > 0 or len(err.strip()) > 0 : if code > 0 or len(err.strip()) > 0 :
error_lines = err.splitlines() error_lines = err.splitlines()
assertion('len(error_lines) > 0') assertion('len(error_lines) > 0')
@ -247,8 +247,8 @@ class DraftYangChecker(object):
cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, tmplib=workdir, cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, tmplib=workdir,
draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, ianalib=settings.SUBMIT_YANG_IANA_MODEL_DIR, ) draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, ianalib=settings.SUBMIT_YANG_IANA_MODEL_DIR, )
code, out, err = pipe(cmd) code, out, err = pipe(cmd)
out = out.decode() out = out.decode('utf-8')
err = err.decode() err = err.decode('utf-8')
if code > 0 or len(err.strip()) > 0: if code > 0 or len(err.strip()) > 0:
err_lines = err.splitlines() err_lines = err.splitlines()
for line in err_lines: for line in err_lines: