Rename LoggerFixture to FakeLogger.

6 files changed, 28 insertions, 18 deletions

diff --git a/NEWS b/NEWS
index 2bf0a82..a9fcbd0 100644
--- a/NEWS
+++ b/NEWS
@@ -8,8 +8,8 @@ IN DEVELOPMENT
 
 CHANGES:
 
-* EnvironmentVariableFixture renamed to EnvironmentVariable. Still available
-  under old, deprecated name.
+* EnvironmentVariableFixture and LoggerFixture renamed to EnvironmentVariable
+  and FakeLogger. Both are still available under their old, deprecated names.
   (Jonathan Lange, #893539)
 
 * EnvironmentVariableFixture now upcalls via super().
diff --git a/README b/README
index 8ced198..8a88c1e 100644
--- a/README
+++ b/README
@@ -274,13 +274,13 @@ new value.
 
   >>> fixture = fixtures.EnvironmentVariable('HOME')
 
-LoggerFixture
-+++++++++++++
+FakeLogger
+++++++++++
 
 Isolate your code from an external logging configuration - so that your test
 gets the output from logged messages, but they don't go to e.g. the console.
 
-  >>> fixture = fixtures.LoggerFixture()
+  >>> fixture = fixtures.FakeLogger()
 
 MonkeyPatch
 +++++++++++
diff --git a/lib/fixtures/__init__.py b/lib/fixtures/__init__.py
index c86545f..6273984 100644
--- a/lib/fixtures/__init__.py
+++ b/lib/fixtures/__init__.py
@@ -41,6 +41,7 @@ __version__ = (0, 3, 8, 'beta', 0)
 __all__ = [
     'EnvironmentVariable',
     'EnvironmentVariableFixture',
+    'FakeLogger',
     'Fixture',
     'FunctionFixture',
     'LoggerFixture',
@@ -59,6 +60,7 @@ from fixtures.fixture import Fixture, FunctionFixture, MethodFixture
 from fixtures._fixtures import (
     EnvironmentVariable,
     EnvironmentVariableFixture,
+    FakeLogger,
     LoggerFixture,
     MonkeyPatch,
     PackagePathEntry,
diff --git a/lib/fixtures/_fixtures/__init__.py b/lib/fixtures/_fixtures/__init__.py
index 59f93f9..9b4f0fe 100644
--- a/lib/fixtures/_fixtures/__init__.py
+++ b/lib/fixtures/_fixtures/__init__.py
@@ -19,6 +19,7 @@
 __all__ = [
     'EnvironmentVariable',
     'EnvironmentVariableFixture',
+    'FakeLogger',
     'LoggerFixture',
     'MonkeyPatch',
     'PackagePathEntry',
@@ -33,7 +34,10 @@ from fixtures._fixtures.environ import (
     EnvironmentVariable,
     EnvironmentVariableFixture,
     )
-from fixtures._fixtures.logger import LoggerFixture
+from fixtures._fixtures.logger import (
+    FakeLogger,
+    LoggerFixture,
+    )
 from fixtures._fixtures.monkeypatch import MonkeyPatch
 from fixtures._fixtures.popen import PopenFixture
 from fixtures._fixtures.packagepath import PackagePathEntry
diff --git a/lib/fixtures/_fixtures/logger.py b/lib/fixtures/_fixtures/logger.py
index a4aa7cf..f9d1daf 100644
--- a/lib/fixtures/_fixtures/logger.py
+++ b/lib/fixtures/_fixtures/logger.py
@@ -19,15 +19,16 @@ from cStringIO import StringIO
 from fixtures import Fixture
 
 __all__ = [
+    'FakeLogger',
     'LoggerFixture',
     ]
 
 
-class LoggerFixture(Fixture):
+class FakeLogger(Fixture):
     """Replace a logger and capture its output."""
 
     def __init__(self, name="", level=INFO, format=None, nuke_handlers=True):
-        """Create a LoggerFixture.
+        """Create a FakeLogger fixture.
 
         :param name: The name of the logger to replace. Defaults to "".
         :param level: The log level to set, defaults to INFO.
@@ -43,14 +44,14 @@ class LoggerFixture(Fixture):
               logging.info('message')
               self.assertEqual('message', fixture.output)
         """
-        super(LoggerFixture, self).__init__()
+        super(FakeLogger, self).__init__()
         self._name = name
         self._level = level
         self._format = format
         self._nuke_handlers = nuke_handlers
 
     def setUp(self):
-        super(LoggerFixture, self).setUp()
+        super(FakeLogger, self).setUp()
         self._output = StringIO()
         logger = getLogger(self._name) 
         if self._level:
@@ -71,3 +72,6 @@ class LoggerFixture(Fixture):
     @property
     def output(self):
         return self._output.getvalue()
+
+
+LoggerFixture = FakeLogger
diff --git a/lib/fixtures/tests/_fixtures/test_logger.py b/lib/fixtures/tests/_fixtures/test_logger.py
index 89b8994..8ac9999 100644
--- a/lib/fixtures/tests/_fixtures/test_logger.py
+++ b/lib/fixtures/tests/_fixtures/test_logger.py
@@ -18,13 +18,13 @@ import logging
 from testtools import TestCase
 from cStringIO import StringIO
 
-from fixtures import LoggerFixture, TestWithFixtures
+from fixtures import FakeLogger, TestWithFixtures
 
 
-class LoggerFixtureTest(TestCase, TestWithFixtures):
+class FakeLoggerTest(TestCase, TestWithFixtures):
 
     def setUp(self):
-        super(LoggerFixtureTest, self).setUp()
+        super(FakeLoggerTest, self).setUp()
         self.logger = logging.getLogger()
         self.addCleanup(self.removeHandlers, self.logger)
 
@@ -33,7 +33,7 @@ class LoggerFixtureTest(TestCase, TestWithFixtures):
             logger.removeHandler(handler)
 
     def test_output_property_has_output(self):
-        fixture = self.useFixture(LoggerFixture())
+        fixture = self.useFixture(FakeLogger())
         logging.info("some message")
         self.assertEqual("some message\n", fixture.output)
 
@@ -43,7 +43,7 @@ class LoggerFixtureTest(TestCase, TestWithFixtures):
         logger.addHandler(logging.StreamHandler(stream))
         logger.setLevel(logging.INFO)
         logging.info("one")
-        fixture = LoggerFixture()
+        fixture = FakeLogger()
         with fixture:
             logging.info("two")
         logging.info("three")
@@ -54,7 +54,7 @@ class LoggerFixtureTest(TestCase, TestWithFixtures):
         stream = StringIO()
         self.logger.addHandler(logging.StreamHandler(stream))
         self.logger.setLevel(logging.INFO)
-        fixture = LoggerFixture(nuke_handlers=False)
+        fixture = FakeLogger(nuke_handlers=False)
         with fixture:
             logging.info("message")
         self.assertEqual("message\n", fixture.output)
@@ -62,7 +62,7 @@ class LoggerFixtureTest(TestCase, TestWithFixtures):
 
     def test_logging_level_restored(self):
         self.logger.setLevel(logging.DEBUG)
-        fixture = LoggerFixture(level=logging.WARNING)
+        fixture = FakeLogger(level=logging.WARNING)
         with fixture:
             # The fixture won't capture this, because the DEBUG level
             # is lower than the WARNING one
@@ -72,7 +72,7 @@ class LoggerFixtureTest(TestCase, TestWithFixtures):
         self.assertEqual(logging.DEBUG, self.logger.level)
 
     def test_custom_format(self):
-        fixture = LoggerFixture(format="%(module)s")
+        fixture = FakeLogger(format="%(module)s")
         self.useFixture(fixture)
         logging.info("message")
         self.assertEqual("test_logger\n", fixture.output)