openstack
/
fuel-octane
Code Issues Proposed changes

Monkey-patch Formatter.format on 2.6 to globally fix 'None' problem 

Change-Id: Iefd94988643062056362da4f07fcc91a53e77fb1
This commit is contained in:
Yuriy Taraday 2015-09-09 19:41:04 +03:00
parent 9ef3b614f8
commit 32b41b158d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
octane/log.py
View File

@ -12,6 +12,18 @@
import logging
import string
import sys
if sys.version_info < (2, 7):
import functools
@functools.wraps(logging.Formatter.format)
def new_format(self, record, string=string,
old_format=logging.Formatter.format):
if string.find is None:
string.find = str.find
return old_format(self, record)
logging.Formatter.format = new_format
class ColorFormatter(logging.Formatter):
@ -23,10 +35,8 @@ class ColorFormatter(logging.Formatter):
logging.CRITICAL: '\033[01;31m', # BOLD RED
}
def format(self, record, string=string, Formatter=logging.Formatter):
def format(self, record, Formatter=logging.Formatter):
# Hack to get last log line instead of exception on 2.6
if string.find is None:
string.find = str.find
res = Formatter.format(self, record) # old-style class on 2.6
return self.LEVEL_COLORS[record.levelno] + res + '\033[m'