From 1663737e38deb18972190a56e951e913e20cd82a Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Thu, 13 Dec 2012 15:42:32 +0000 Subject: Drop the MementoHandler stuff. --- lib/fixtures/_fixtures/logger.py | 44 +---------------------------- lib/fixtures/tests/_fixtures/test_logger.py | 22 --------------- 2 files changed, 1 insertion(+), 65 deletions(-) diff --git a/lib/fixtures/_fixtures/logger.py b/lib/fixtures/_fixtures/logger.py index f3ba844..660e736 100644 --- a/lib/fixtures/_fixtures/logger.py +++ b/lib/fixtures/_fixtures/logger.py @@ -13,7 +13,7 @@ # license you chose for the specific language governing permissions and # limitations under that license. -from logging import StreamHandler, getLogger, INFO, Formatter, Handler +from logging import StreamHandler, getLogger, INFO, Formatter from cStringIO import StringIO from testtools.content import Content @@ -109,45 +109,3 @@ class FakeLogger(Fixture): LoggerFixture = FakeLogger - - -class MementoHandler(Handler): - """A handler class which stores logging records in a list. - - From http://nessita.pastebin.com/mgc85uQT - """ - def __init__(self, *args, **kwargs): - """Create the instance, and add a records attribute.""" - Handler.__init__(self, *args, **kwargs) - self.records = [] - - def emit(self, record): - """Just add the dict of the record to self.records.""" - # logging actually uses LogRecord.__dict__ regularly. Sheesh. - self.records.append(record.__dict__) - - -class MementoLogger(Fixture): - - def __init__(self, name="", level=INFO, nuke_handlers=True): - """Create a MementoLogger fixture. - - :param name: The name of the logger to replace. Defaults to "". - :param level: The log level to set, defaults to INFO. - :param nuke_handlers: If True remove all existing handles (prevents - existing messages going to e.g. stdout). Defaults to True. - """ - super(MementoLogger, self).__init__() - self._name = name - self._level = level - self._nuke_handlers = nuke_handlers - - def setUp(self): - super(MementoLogger, self).setUp() - self._handler = MementoHandler() - self.useFixture( - LogHandler(self._handler, name=self._name, level=self._level, - nuke_handlers=self._nuke_handlers)) - - def get_records(self): - return self._handler.records diff --git a/lib/fixtures/tests/_fixtures/test_logger.py b/lib/fixtures/tests/_fixtures/test_logger.py index c3d23fb..c05e862 100644 --- a/lib/fixtures/tests/_fixtures/test_logger.py +++ b/lib/fixtures/tests/_fixtures/test_logger.py @@ -23,7 +23,6 @@ from fixtures import ( LogHandler, TestWithFixtures, ) -from fixtures._fixtures.logger import MementoHandler class FakeLoggerTest(TestCase, TestWithFixtures): @@ -97,27 +96,6 @@ class FakeLoggerTest(TestCase, TestWithFixtures): self.assertEqual("", fixture.getDetails()[detail_name].as_text()) -class TestMementoHandler(TestCase): - - class FakeRecord(object): - def __init__(self, **kw): - self.__dict__.update(kw) - - def test_initialy_no_records(self): - handler = MementoHandler() - self.assertEqual([], handler.records) - - def test_emit_stored_in_records(self): - handler = MementoHandler() - marker = self.FakeRecord(foo='bar') - handler.emit(marker) - self.assertEqual([{'foo': 'bar'}], handler.records) - - def test_is_log_handler(self): - handler = MementoHandler() - self.assertIsInstance(handler, logging.Handler) - - class LogHandlerTest(TestCase, TestWithFixtures): class CustomHandler(logging.Handler): -- cgit v1.2.1