x/python-ganttclient
Code Issues Proposed changes

Merge "Fix broken logging imports."

Browse Source
This commit is contained in:
Jenkins
2013-02-20 15:15:24 +00:00
committed by Gerrit Code Review
parent 7b86fc7f53 43fef88b74
commit 2cc12920bb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HACKING.rst
View File

@@ -63,7 +63,6 @@ Imports
- imports from ``migrate`` package - imports from ``migrate`` package
- imports from ``sqlalchemy`` package - imports from ``sqlalchemy`` package
- imports from ``nova.db.sqlalchemy.session`` module - imports from ``nova.db.sqlalchemy.session`` module
- imports from ``nova.openstack.common.log.logging`` package
- imports from ``nova.db.sqlalchemy.migration.versioning_api`` package - imports from ``nova.db.sqlalchemy.migration.versioning_api`` package
Example:: Example::

11
nova/tests/test_imagecache.py
View File

@@ -20,7 +20,6 @@ import contextlib
import cStringIO import cStringIO
import hashlib import hashlib
import json import json
import logging
import os import os
import time import time
@@ -30,7 +29,7 @@ from nova.compute import vm_states
from nova import conductor from nova import conductor
from nova import db from nova import db
from nova.openstack.common import importutils from nova.openstack.common import importutils
from nova.openstack.common import log from nova.openstack.common import log as logging
from nova import test from nova import test
from nova import utils from nova import utils
from nova.virt.libvirt import imagecache from nova.virt.libvirt import imagecache
@@ -40,7 +39,7 @@ CONF = cfg.CONF
CONF.import_opt('compute_manager', 'nova.service') CONF.import_opt('compute_manager', 'nova.service')
CONF.import_opt('host', 'nova.netconf') CONF.import_opt('host', 'nova.netconf')
LOG = log.getLogger(__name__) LOG = logging.getLogger(__name__)
class ImageCacheManagerTestCase(test.TestCase): class ImageCacheManagerTestCase(test.TestCase):
@@ -341,10 +340,10 @@ class ImageCacheManagerTestCase(test.TestCase):
@contextlib.contextmanager @contextlib.contextmanager
def _intercept_log_messages(self): def _intercept_log_messages(self):
try: try:
mylog = log.getLogger('nova') mylog = logging.getLogger('nova')
stream = cStringIO.StringIO() stream = cStringIO.StringIO()
handler = logging.StreamHandler(stream) handler = logging.logging.StreamHandler(stream)
handler.setFormatter(log.LegacyFormatter()) handler.setFormatter(logging.LegacyFormatter())
mylog.logger.addHandler(handler) mylog.logger.addHandler(handler)
yield stream yield stream
finally: finally: