From 08e2ffa10925e5ccfe687380c144dfa30c26bf94 Mon Sep 17 00:00:00 2001 From: Benedek Racz Date: Mon, 30 Mar 2020 09:05:36 +0200 Subject: [PATCH] [FIX] fix duplicated logging #28 --- .gitignore | 4 +++- wexpect/console_reader.py | 2 -- wexpect/host.py | 2 -- wexpect/wexpect_util.py | 6 +++++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 16d92ca..7118ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +test_01_installed/* + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] @@ -42,7 +44,7 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ .tox/ -.coverage +.coverage* .cache nosetests.xml coverage.xml diff --git a/wexpect/console_reader.py b/wexpect/console_reader.py index 6d1822c..4dd532d 100644 --- a/wexpect/console_reader.py +++ b/wexpect/console_reader.py @@ -42,8 +42,6 @@ default_port = 4321 # logger = logging.getLogger('wexpect') -init_logger(logger) - class ConsoleReaderBase: """Consol class (aka. client-side python class) for the child. diff --git a/wexpect/host.py b/wexpect/host.py index 5273562..b2c8336 100644 --- a/wexpect/host.py +++ b/wexpect/host.py @@ -65,8 +65,6 @@ from .wexpect_util import SIGNAL_CHARS logger = logging.getLogger('wexpect') -init_logger(logger) - def run(command, timeout=-1, withexitstatus=False, events=None, extra_args=None, logfile=None, cwd=None, env=None, **kwargs): diff --git a/wexpect/wexpect_util.py b/wexpect/wexpect_util.py index ed1c232..03ebf14 100644 --- a/wexpect/wexpect_util.py +++ b/wexpect/wexpect_util.py @@ -36,7 +36,9 @@ def spam(self, message, *args, **kws): logging.Logger.spam = spam -def init_logger(logger): +def init_logger(logger=None): + if logger is None: + logger = logging.getLogger('wexpect') try: logger_level = os.environ['WEXPECT_LOGGER_LEVEL'] try: @@ -160,3 +162,5 @@ class EOF(ExceptionPexpect): class TIMEOUT(ExceptionPexpect): """Raised when a read time exceeds the timeout. """ + +init_logger()