From 72e3e1177dc23b4f3d358294d68b58c01d7c5931 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Wed, 13 Jan 2016 10:49:05 +0800 Subject: [PATCH] Remove work around for NullHandler logging module added NullHandler in Python 2.7, we have dropped Python 2.6 support now, so don't need the work around any more. Change-Id: Ib6fdbc2f92cd66f4846243221e696f1b1fa712df --- stevedore/__init__.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/stevedore/__init__.py b/stevedore/__init__.py index 93a56b2..a471f31 100644 --- a/stevedore/__init__.py +++ b/stevedore/__init__.py @@ -20,17 +20,5 @@ import logging # the app we're used from does not set up logging. LOG = logging.getLogger('stevedore') -if hasattr(logging, 'NullHandler'): - LOG.addHandler(logging.NullHandler()) -else: - class NullHandler(logging.Handler): - def handle(self, record): - pass +LOG.addHandler(logging.NullHandler()) - def emit(self, record): - pass - - def createLock(self): - self.lock = None - - LOG.addHandler(NullHandler())