[Pytest-commit] [pytest-dev/pytest] 0603d1: capture: ensure name of EncodedFile being a string

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0603d1d500c14a67715e486568b50f15b2086616
      https://github.com/pytest-dev/pytest/commit/0603d1d500c14a67715e486568b50f15b2086616
  Author: Daniel Hahler <git at thequod.de>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2555.bugfix
    M testing/test_capture.py

  Log Message:
  -----------
  capture: ensure name of EncodedFile being a string

Fixes https://github.com/pytest-dev/pytest/issues/2555.


  Commit: dd294aafb3ad8c651bb0dc986494145f55995641
      https://github.com/pytest-dev/pytest/commit/dd294aafb3ad8c651bb0dc986494145f55995641
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/2555.bugfix
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2557 from blueyed/EncodedFile-name

capture: ensure name of EncodedFile being a string


Compare: https://github.com/pytest-dev/pytest/compare/2c2cf81d0a86...dd294aafb3ad