openstack/oslo.log
Code Issues Proposed changes

Merge "Unify different names between Python2/3 with six.moves"

Browse Source
This commit is contained in:
Jenkins 2013-11-28 15:51:40 +00:00 committed by Gerrit Code Review
commit 9feea9c15e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/common/log.py
View File

@ -349,7 +349,7 @@ class JSONFormatter(logging.Formatter):
def formatException(self, ei, strip_newlines=True): def formatException(self, ei, strip_newlines=True):
lines = traceback.format_exception(*ei) lines = traceback.format_exception(*ei)
if strip_newlines: if strip_newlines:
lines = [itertools.ifilter( lines = [moves.filter(
lambda x: x, lambda x: x,
line.rstrip().splitlines()) for line in lines] line.rstrip().splitlines()) for line in lines]
lines = list(itertools.chain(*lines)) lines = list(itertools.chain(*lines))

4
tests/unit/test_local.py
View File

@ -15,6 +15,8 @@
import threading import threading
from six import moves
from openstack.common import local from openstack.common import local
from openstack.common import test from openstack.common import test
@ -36,7 +38,7 @@ class LocalStoreTestCase(test.BaseTestCase):
# testing in (eventlet vs normal python threading) so # testing in (eventlet vs normal python threading) so
# we test the correct type of local store for the current # we test the correct type of local store for the current
# threading model # threading model
reload(local) moves.reload_module(local)
def test_thread_unique_storage(self): def test_thread_unique_storage(self):
"""Make sure local store holds thread specific values.""" """Make sure local store holds thread specific values."""