Merge branch 'revert-more_itertools-master' into introduce-more_itertools

_pytest/logging.py

@@ -1,3 +1,4 @@
+""" Access and control log capturing. """
 from __future__ import absolute_import, division, print_function
 
 import logging

_pytest/main.py

@@ -177,7 +177,7 @@ def _in_venv(path):
     """Attempts to detect if ``path`` is the root of a Virtual Environment by
     checking for the existence of the appropriate activate script"""
     bindir = path.join('Scripts' if sys.platform.startswith('win') else 'bin')
-    if not bindir.exists():
+    if not bindir.isdir():
         return False
     activates = ('activate', 'activate.csh', 'activate.fish',
                  'Activate', 'Activate.bat', 'Activate.ps1')

changelog/3209.doc.rst

@@ -0,0 +1 @@
+Add logging plugin to plugins list.

changelog/3241.bugfix.rst

@@ -0,0 +1,2 @@
+Refactor check of bindir from ``exists`` to ``isdir`` regarding `#3241 <https://github.com/pytest-dev/pytest/issues/3241>`_.
+

doc/en/plugins.rst

@@ -148,6 +148,7 @@ in the `pytest repository <https://github.com/pytest-dev/pytest>`_.
     _pytest.resultlog
     _pytest.runner
     _pytest.main
+    _pytest.logging
     _pytest.skipping
     _pytest.terminal
     _pytest.tmpdir