From b3244242aa5f142d439f803c9f60888d860ba5d3 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 18 Jul 2019 18:53:14 +0000 Subject: [PATCH] Fixed some issues with the Py2/3 changes to the populate_yang_model_dirs management command. - Legacy-Id: 16520 --- .../management/commands/populate_yang_model_dirs.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ietf/utils/management/commands/populate_yang_model_dirs.py b/ietf/utils/management/commands/populate_yang_model_dirs.py index 5ea74fa31..14c72d421 100644 --- a/ietf/utils/management/commands/populate_yang_model_dirs.py +++ b/ietf/utils/management/commands/populate_yang_model_dirs.py @@ -9,7 +9,7 @@ import sys import time from pathlib2 import Path -from io import StringIO +from six import StringIO from textwrap import dedent from xym import xym @@ -83,15 +83,18 @@ class Command(BaseCommand): model_list = [ n.replace('"','') for n in model_list ] except Exception as e: self.stderr.write("** Error when extracting from %s: %s" % (file, str(e))) - sys.stdout = saved_stdout - sys.stderr = saved_stderr + finally: + sys.stdout = saved_stdout + sys.stderr = saved_stderr # if verbosity > 1: outmsg = xymout.getvalue() - self.stdout.write(outmsg) + if outmsg.strip(): + self.stdout.write(outmsg) if verbosity>2: errmsg = xymerr.getvalue() - self.stderr.write(errmsg) + if errmsg.strip(): + self.stderr.write(errmsg) return model_list # Extract from new RFCs