02-unknown.patch 659 B

12345678910111213141516171819
  1. --- contrib/python/pytest-mock/py2/pytest_mock/plugin.py (index)
  2. +++ contrib/python/pytest-mock/py2/pytest_mock/plugin.py (working tree)
  3. @@ -5,6 +5,7 @@ import inspect
  4. import sys
  5. import pytest
  6. +import six
  7. from ._version import version
  8. @@ -172,7 +173,7 @@ class MockFixture(object):
  9. if info.code_context is None:
  10. # no source code available (#169)
  11. return
  12. - code_context = " ".join(info.code_context).strip()
  13. + code_context = " ".join(six.ensure_text(x) for x in info.code_context).strip()
  14. if code_context.startswith("with mocker."):
  15. raise ValueError(