From 016097304c22f25feb856dc47b9d8a0d3847888e Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Tue, 30 Nov 2021 19:13:27 +0100 Subject: [PATCH] add stderrflag and stoutflag for std streams (#88) --- ChangeLog | 4 ++++ nxswriter/Release.py | 2 +- nxswriter/StreamSet.py | 17 ++++++++++++----- test/StreamSet_test.py | 42 +++++++++++++++++++++++------------------- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index ace6b01f..f41e1618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2021-11-30 Jan Kotanski + * add stderrflag and stoutflag for std streams + * tagged as 3.2.0 + 2021-07-29 Jan Kotanski * currenttime from the nxstools package used * tagged as 3.1.2 diff --git a/nxswriter/Release.py b/nxswriter/Release.py index b8b9b588..645da4d3 100644 --- a/nxswriter/Release.py +++ b/nxswriter/Release.py @@ -21,4 +21,4 @@ #: package version -__version__ = "3.1.2" +__version__ = "3.2.0" diff --git a/nxswriter/StreamSet.py b/nxswriter/StreamSet.py index 8fb89224..bff000ec 100644 --- a/nxswriter/StreamSet.py +++ b/nxswriter/StreamSet.py @@ -23,6 +23,13 @@ import weakref +# (:obj:`bool`) write stream to stdout +stdoutflag = False + +# (:obj:`bool`) write stream to stderrr +stderrflag = True + + class StreamSet(object): def __init__(self, streams): @@ -59,7 +66,7 @@ def __init__(self, streams): if hasattr(streams(), "log_debug"): self.log_debug = streams().log_debug - def fatal(self, message, std=True): + def fatal(self, message, std=stderrflag): """ writes fatal error message :param message: error message @@ -77,7 +84,7 @@ def fatal(self, message, std=True): except Exception: print(message) - def error(self, message, std=True): + def error(self, message, std=stderrflag): """ writes error message :param message: error message @@ -95,7 +102,7 @@ def error(self, message, std=True): except Exception: print(message) - def warn(self, message, std=True): + def warn(self, message, std=stderrflag): """ writes warning message :param message: warning message @@ -113,7 +120,7 @@ def warn(self, message, std=True): except Exception: print(message) - def info(self, message, std=True): + def info(self, message, std=stdoutflag): """ writes info message :param message: info message @@ -131,7 +138,7 @@ def info(self, message, std=True): except Exception: print(message) - def debug(self, message, std=True): + def debug(self, message, std=stdoutflag): """ writes debug message :param message: debug message diff --git a/test/StreamSet_test.py b/test/StreamSet_test.py index d59de942..b1b57a5e 100644 --- a/test/StreamSet_test.py +++ b/test/StreamSet_test.py @@ -22,25 +22,29 @@ import unittest import os import sys +# import subprocess import random -import time import struct import binascii - -try: - from cStringIO import StringIO -except Exception: - from io import StringIO +import time from nxswriter import StreamSet -# if 64-bit machione -IS64BIT = (struct.calcsize("P") == 8) +# import string +if sys.version_info > (3,): + from io import StringIO +else: + from StringIO import StringIO + if sys.version_info > (3,): long = int +# if 64-bit machione +IS64BIT = (struct.calcsize("P") == 8) + + # test fixture class StreamSetTest(unittest.TestCase): @@ -75,7 +79,7 @@ def getRandomString(self, maxsize): # test starter # \brief Common set up def setUp(self): - print("SEED = %s" % self.__seed) + print("SEED =%s" % self.__seed) print("\nsetting up...") self.streams = StreamSet.StreamSet(None) hasattr(self.streams, "log_fatal") @@ -328,10 +332,7 @@ def test_info(self): name = self.getRandomString(100) sys.stdout = self.mystdout = StringIO() sys.stderr = self.mystderr = StringIO() - if i % 2: - self.streams.info(name) - else: - self.streams.info(name, std=True) + self.streams.info(name, std=True) self.assertEqual(self.streams.log_fatal, None) self.assertEqual(self.streams.log_error, None) self.assertEqual(self.streams.log_warn, None) @@ -349,7 +350,10 @@ def test_info_nostd(self): name = self.getRandomString(100) sys.stdout = self.mystdout = StringIO() sys.stderr = self.mystderr = StringIO() - self.streams.info(name, std=False) + if i % 2 == 0: + self.streams.info(name) + else: + self.streams.info(name, std=False) self.assertEqual(self.streams.log_fatal, None) self.assertEqual(self.streams.log_error, None) self.assertEqual(self.streams.log_warn, None) @@ -397,10 +401,7 @@ def test_debug(self): name = self.getRandomString(100) sys.stdout = self.mystdout = StringIO() sys.stderr = self.mystderr = StringIO() - if i % 2: - self.streams.debug(name) - else: - self.streams.debug(name, std=True) + self.streams.debug(name, std=True) self.assertEqual(self.streams.log_fatal, None) self.assertEqual(self.streams.log_error, None) self.assertEqual(self.streams.log_warn, None) @@ -418,7 +419,10 @@ def test_debug_nostd(self): name = self.getRandomString(100) sys.stdout = self.mystdout = StringIO() sys.stderr = self.mystderr = StringIO() - self.streams.debug(name, std=False) + if i % 2: + self.streams.debug(name) + else: + self.streams.debug(name, std=False) self.assertEqual(self.streams.log_fatal, None) self.assertEqual(self.streams.log_error, None) self.assertEqual(self.streams.log_warn, None)