merge next chunk from master and fix changelog linting issue

AUTHORS

@@ -62,6 +62,7 @@ Marc Schlaich
 Mark Abramowitz
 Markus Unterwaditzer
 Martijn Faassen
+Martin Prusse
 Matt Bachmann
 Matt Williams
 Michael Aquilina

CHANGELOG.rst

@@ -77,6 +77,10 @@
 
 *
 
+* Fix maximum recursion depth detection when raised error class is not aware
+  of unicode/encoded bytes.
+  Thanks `@prusse-martin`_ for the PR (`#1506`_).
+
 * Fix ``pytest.mark.skip`` mark when used in strict mode.
   Thanks `@pquentin`_ for the PR and `@RonnyPfannschmidt`_ for
   showing how to fix the bug.
@@ -85,6 +89,11 @@
   Thanks `@omarkohl`_ for the PR.
 
 
+.. _#1506: https://github.com/pytest-dev/pytest/pull/1506
+
+.. _@prusse-martin: https://github.com/prusse-martin
+
+
 2.9.1
 =====
 
@@ -238,7 +247,6 @@
 .. _@RonnyPfannschmidt: https://github.com/RonnyPfannschmidt
 .. _@rabbbit: https://github.com/rabbbit
 .. _@hackebrot: https://github.com/hackebrot
-.. _@omarkohl: https://github.com/omarkohl
 .. _@pquentin: https://github.com/pquentin
 
 2.8.7

_pytest/_code/code.py

@@ -603,8 +603,7 @@ class FormattedExcinfo(object):
         if self.tbfilter:
             traceback = traceback.filter()
         recursionindex = None
-        if excinfo.errisinstance(RuntimeError):
-            if "maximum recursion depth exceeded" in str(excinfo.value):
+        if is_recursion_error(excinfo):
             recursionindex = traceback.recursionindex()
         last = traceback[-1]
         entries = []
@@ -867,3 +866,14 @@ def getrawcode(obj, trycall=True):
                     return x
         return obj
 
+if sys.version_info[:2] >= (3, 5):  # RecursionError introduced in 3.5
+    def is_recursion_error(excinfo):
+        return excinfo.errisinstance(RecursionError)  # noqa
+else:
+    def is_recursion_error(excinfo):
+        if not excinfo.errisinstance(RuntimeError):
+            return False
+        try:
+            return "maximum recursion depth exceeded" in str(excinfo.value)
+        except UnicodeError:
+            return False

_pytest/mark.py

@@ -58,7 +58,7 @@ pytest_cmdline_main.tryfirst = True
 
 
 def pytest_collection_modifyitems(items, config):
-    keywordexpr = config.option.keyword
+    keywordexpr = config.option.keyword.lstrip()
     matchexpr = config.option.markexpr
     if not keywordexpr and not matchexpr:
         return

doc/en/usage.rst

@@ -158,7 +158,7 @@ To get a list of the slowest 10 test durations::
 Creating JUnitXML format files
 ----------------------------------------------------
 
-To create result files which can be read by Hudson_ or other Continuous
+To create result files which can be read by Jenkins_ or other Continuous
 integration servers, use this invocation::
 
     py.test --junitxml=path

testing/acceptance_test.py

@@ -671,6 +671,11 @@ class TestDurations:
             "*call*test_1*",
         ])
 
+    def test_with_not(self, testdir):
+        testdir.makepyfile(self.source)
+        result = testdir.runpytest("-k not 1")
+        assert result.ret == 0
+
 
 class TestDurationWithFixture:
     source = """

testing/code/test_excinfo.py

@@ -4,7 +4,10 @@ import operator
 import _pytest
 import py
 import pytest
-from _pytest._code.code import (FormattedExcinfo, ReprExceptionInfo,
+from _pytest._code.code import (
+    ExceptionInfo,
+    FormattedExcinfo,
+    ReprExceptionInfo,
     ExceptionChainRepr)
 
 queue = py.builtin._tryimport('queue', 'Queue')
@@ -1048,3 +1051,18 @@ raise ValueError()
         assert tw.lines[40] == "E       AttributeError"
         assert tw.lines[41] == ""
         assert tw.lines[42].endswith("mod.py:15: AttributeError")
+
+
+@pytest.mark.parametrize("style", ["short", "long"])
+@pytest.mark.parametrize("encoding", [None, "utf8", "utf16"])
+def test_repr_traceback_with_unicode(style, encoding):
+    msg = u'☹'
+    if encoding is not None:
+        msg = msg.encode(encoding)
+    try:
+        raise RuntimeError(msg)
+    except RuntimeError:
+        e_info = ExceptionInfo()
+    formatter = FormattedExcinfo(style=style)
+    repr_traceback = formatter.repr_traceback(e_info)
+    assert repr_traceback is not None