[Pytest-commit] [pytest-dev/pytest] ba9a76: Provides encoding attribute on CaptureIO

[Bruno Oliveira]

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: ba9a76fdb33de948113b0e1908c9a8f95fde1627
      https://github.com/pytest-dev/pytest/commit/ba9a76fdb33de948113b0e1908c9a8f95fde1627
  Author: Llandy Riveron Del Risco <llandy3d at gmail.com>
  Date:   2017-07-16 (Sun, 16 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

  Log Message:
  -----------
  Provides encoding attribute on CaptureIO

Fix #2375


  Commit: 56e6b4b501258393e5ee8921df2f2a55141b7712
      https://github.com/pytest-dev/pytest/commit/56e6b4b501258393e5ee8921df2f2a55141b7712
  Author: Floris Bruynooghe <flub at devork.be>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

  Log Message:
  -----------
  Merge pull request #2578 from Llandy3d/2375

Provides encoding attribute on CaptureIO


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

  Changed paths:
    M _pytest/compat.py
    M testing/test_capture.py

  Log Message:
  -----------
  Fix: do not load hypothesis during test_logging_initialized_in_test

A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test


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

  Changed paths:
    M AUTHORS
    M _pytest/compat.py
    A changelog/2375.trivial
    M testing/test_capture.py

  Log Message:
  -----------
  Merge branch 'master' into features


Compare: https://github.com/pytest-dev/pytest/compare/9e3e58af6069...abb5d2084192