From 2c6e60380a705965066fc9f6e81cfa83d71c4390 Mon Sep 17 00:00:00 2001 From: Brad Date: Thu, 21 Feb 2019 19:19:19 -0500 Subject: [PATCH] Add NullHandler to logger for all Python versions (#896) --- elasticsearch/__init__.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/elasticsearch/__init__.py b/elasticsearch/__init__.py index 59b3c8bc..0d12966e 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,18 +1,22 @@ +#flake8: noqa from __future__ import absolute_import VERSION = (6, 3, 1) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) +import logging +try: # Python 2.7+ + from logging import NullHandler +except ImportError: + class NullHandler(logging.Handler): + def emit(self, record): + pass + import sys -if (2, 7) <= sys.version_info < (3, 2): - # On Python 2.7 and Python3 < 3.2, install no-op handler to silence - # `No handlers could be found for logger "elasticsearch"` message per - # - import logging - logger = logging.getLogger('elasticsearch') - logger.addHandler(logging.NullHandler()) +logger = logging.getLogger('elasticsearch') +logger.addHandler(logging.NullHandler()) from .client import Elasticsearch from .transport import Transport