x/deb-oslo.log
Code Issues Proposed changes

Drop python 2.6 support

Browse Source 
Change-Id: I94040c16e0e96fa0643baae94f87490ac5d7c255
This commit is contained in:
ChangBo Guo(gcb) 2015-11-23 23:33:09 +08:00
parent b8be549a4a
commit c9575f4d87
2 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
oslo_log/handlers.py
View File

@ -23,18 +23,7 @@ except ImportError:
from debtcollector import removals
try:
NullHandler = logging.NullHandler
except AttributeError: # NOTE(jkoelker) NullHandler added in Python 2.7
class NullHandler(logging.Handler):
def handle(self, record):
pass
def emit(self, record):
pass
def createLock(self):
self.lock = None
NullHandler = logging.NullHandler
def _get_binary_name():
@ -55,16 +44,10 @@ class RFCSysLogHandler(logging.handlers.SysLogHandler):
)
def __init__(self, *args, **kwargs):
self.binary_name = _get_binary_name()
# Do not use super() unless type(logging.handlers.SysLogHandler)
# is 'type' (Python 2.7).
# Use old style calls, if the type is 'classobj' (Python 2.6)
logging.handlers.SysLogHandler.__init__(self, *args, **kwargs)
super(RFCSysLogHandler, self).__init__(*args, **kwargs)
def format(self, record):
# Do not use super() unless type(logging.handlers.SysLogHandler)
# is 'type' (Python 2.7).
# Use old style calls, if the type is 'classobj' (Python 2.6)
msg = logging.handlers.SysLogHandler.format(self, record)
msg = super(RFCSysLogHandler, self).format(record)
msg = self.binary_name + ' ' + msg
return msg

22
oslo_log/log.py
View File

@ -45,8 +45,6 @@ from oslo_utils import importutils
import six
from six import moves
_PY26 = sys.version_info[0:2] == (2, 6)
from oslo_log._i18n import _
from oslo_log import _options
from oslo_log import formatters
@ -93,15 +91,6 @@ class BaseLoggerAdapter(logging.LoggerAdapter):
def trace(self, msg, *args, **kwargs):
self.log(TRACE, msg, *args, **kwargs)
def isEnabledFor(self, level):
if _PY26:
# This method was added in python 2.7 (and it does the exact
# same logic, so we need to do the exact same logic so that
# python 2.6 has this capability as well).
return self.logger.isEnabledFor(level)
else:
return super(BaseLoggerAdapter, self).isEnabledFor(level)
def _ensure_unicode(msg):
"""Do our best to turn the input argument into a unicode object.
@ -390,17 +379,10 @@ def _setup_logging_from_conf(conf, project, version):
numeric_level = int(level_name)
except ValueError: # nosec
pass
# NOTE(AAzza) in python2.6 Logger.setLevel doesn't convert string name
# to integer code.
if _PY26:
if numeric_level is None:
numeric_level = logging.getLevelName(level_name)
if numeric_level is not None:
logger.setLevel(numeric_level)
else:
if numeric_level is not None:
logger.setLevel(numeric_level)
else:
logger.setLevel(level_name)
logger.setLevel(level_name)
_loggers = {}