support for python2.6 added

pytest_logger/plugin.py

@@ -149,8 +149,8 @@ class Formatter(logging.Formatter):
         logging.DEBUG: 'dbg',
     }
 
-    def __init__(self, *args, **kwargs):
-        super(Formatter, self).__init__(*args, **kwargs)
+    def __init__(self, fmt):
+        logging.Formatter.__init__(self, fmt)
         self._start = time.time()
 
     def formatTime(self, record, datefmt=None):
@@ -161,7 +161,7 @@ def formatTime(self, record, datefmt=None):
     def format(self, record):
         record.levelshortname = Formatter.short_level_names.get(record.levelno,
                                                                 'l%s' % record.levelno)
-        return super(Formatter, self).format(record)
+        return logging.Formatter.format(self, record)
 
 
 @pytest.fixture
@@ -235,7 +235,7 @@ def _make_handlers(stdoutloggers, fileloggers, item):
 def _make_stdout_handlers(loggers, fmt):
     def make_handler(logger_and_level, fmt):
         logger, level = logger_and_level
-        handler = logging.StreamHandler(stream=sys.stdout)
+        handler = logging.StreamHandler(sys.stdout)
         handler.setFormatter(fmt)
         handler.setLevel(level)
         handler.logger = logger

tests/test_pytest_logger.py

@@ -191,14 +191,14 @@ def test_file_handlers(testdir, conftest_py, test_case_py):
     ])
 
     assert ls(basetemp(testdir), 'logs') == [test_case_py]
-    assert ls(basetemp(testdir), 'logs/{}'.format(test_case_py)) == ['test_case']
-    assert ls(basetemp(testdir), 'logs/{}/test_case'.format(test_case_py)) == ['bar', 'foo']
+    assert ls(basetemp(testdir), 'logs/{0}'.format(test_case_py)) == ['test_case']
+    assert ls(basetemp(testdir), 'logs/{0}/test_case'.format(test_case_py)) == ['bar', 'foo']
 
-    FileLineMatcher(basetemp(testdir), 'logs/{}/test_case/foo'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(basetemp(testdir), 'logs/{0}/test_case/foo'.format(test_case_py)).fnmatch_lines([
         '* foo: this is fatal',
         '* foo: this is warning',
     ])
-    FileLineMatcher(basetemp(testdir), 'logs/{}/test_case/bar'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(basetemp(testdir), 'logs/{0}/test_case/bar'.format(test_case_py)).fnmatch_lines([
         '* bar: this is fatal',
     ])
 
@@ -408,7 +408,7 @@ def test_case{0}():
 def test_logsdir_option(testdir, conftest_py, test_case_py):
 
     logsdir = outdir(testdir, 'myinilogs')
-    result = testdir.runpytest('-s', '--logger-logsdir={}'.format(str(logsdir)))
+    result = testdir.runpytest('-s', '--logger-logsdir={0}'.format(str(logsdir)))
     assert result.ret == 0
     result.stdout.fnmatch_lines([
         '',
@@ -418,13 +418,13 @@ def test_logsdir_option(testdir, conftest_py, test_case_py):
 
     assert ls(logsdir) == [test_case_py]
     assert ls(logsdir, test_case_py) == ['test_case']
-    assert ls(logsdir, '{}/test_case'.format(test_case_py)) == ['bar', 'foo']
+    assert ls(logsdir, '{0}/test_case'.format(test_case_py)) == ['bar', 'foo']
 
-    FileLineMatcher(logsdir, '{}/test_case/foo'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(logsdir, '{0}/test_case/foo'.format(test_case_py)).fnmatch_lines([
         '* foo: this is fatal',
         '* foo: this is warning',
     ])
-    FileLineMatcher(logsdir, '{}/test_case/bar'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(logsdir, '{0}/test_case/bar'.format(test_case_py)).fnmatch_lines([
         '* bar: this is fatal',
     ])
 
@@ -434,7 +434,7 @@ def test_logsdir_ini(testdir, conftest_py, test_case_py):
     logsdir = outdir(testdir, 'myinilogs')
     makefile(testdir, ['pytest.ini'], """
         [pytest]
-        logger_logsdir={}
+        logger_logsdir={0}
     """.format(logsdir))
 
     result = testdir.runpytest('-s')
@@ -447,13 +447,13 @@ def test_logsdir_ini(testdir, conftest_py, test_case_py):
 
     assert ls(logsdir) == [test_case_py]
     assert ls(logsdir, test_case_py) == ['test_case']
-    assert ls(logsdir, '{}/test_case'.format(test_case_py)) == ['bar', 'foo']
+    assert ls(logsdir, '{0}/test_case'.format(test_case_py)) == ['bar', 'foo']
 
-    FileLineMatcher(logsdir, '{}/test_case/foo'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(logsdir, '{0}/test_case/foo'.format(test_case_py)).fnmatch_lines([
         '* foo: this is fatal',
         '* foo: this is warning',
     ])
-    FileLineMatcher(logsdir, '{}/test_case/bar'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(logsdir, '{0}/test_case/bar'.format(test_case_py)).fnmatch_lines([
         '* bar: this is fatal',
     ])
 
@@ -464,7 +464,7 @@ def test_logsdir_cleanup(testdir, conftest_py, test_case_py):
 
     makefile(testdir, ['pytest.ini'], """
         [pytest]
-        logger_logsdir={}
+        logger_logsdir={0}
     """.format(logsdir))
 
     logsdir.ensure('tmpfile').write('\n'.join(Source('this shall be removed')))
@@ -480,12 +480,12 @@ def test_logsdir_cleanup(testdir, conftest_py, test_case_py):
 
     assert ls(logsdir) == [test_case_py]
     assert ls(logsdir, test_case_py) == ['test_case']
-    assert ls(logsdir, '{}/test_case'.format(test_case_py)) == ['bar', 'foo']
+    assert ls(logsdir, '{0}/test_case'.format(test_case_py)) == ['bar', 'foo']
 
-    FileLineMatcher(logsdir, '{}/test_case/foo'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(logsdir, '{0}/test_case/foo'.format(test_case_py)).fnmatch_lines([
         '* foo: this is fatal',
         '* foo: this is warning',
     ])
-    FileLineMatcher(logsdir, '{}/test_case/bar'.format(test_case_py)).fnmatch_lines([
+    FileLineMatcher(logsdir, '{0}/test_case/bar'.format(test_case_py)).fnmatch_lines([
         '* bar: this is fatal',
     ])

tox.ini

@@ -1,13 +1,13 @@
 [tox]
 envlist =
     check,
-    {py27,py34,py35,pypy}-pytest{29,30},
+    {py26,py27,py35,py36,pypy}-pytest{30,31},
     docs
 
 [testenv]
 deps =
-    pytest29: pytest==2.9.*
     pytest30: pytest==3.0.*
+    pytest31: pytest==3.1.*
     pytest-xdist
 commands =
     py.test {posargs} --tb=short -x --strict tests