[Pytest-commit] [pytest-dev/pytest] 43544a: Early import colorama so that it get's the correct...

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 43544a431ca958b411d6b84c7093f03e48461349
      https://github.com/pytest-dev/pytest/commit/43544a431ca958b411d6b84c7093f03e48461349
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Early import colorama so that it get's the correct terminal


  Commit: df12500661e1408d247ff95193ad5a6dc7aaedbb
      https://github.com/pytest-dev/pytest/commit/df12500661e1408d247ff95193ad5a6dc7aaedbb
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    A changelog/2611.bugfix

  Log Message:
  -----------
  Create 2611.bugfix


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

  Changed paths:
    A changelog/2510.bugfix
    R changelog/2611.bugfix

  Log Message:
  -----------
  Update changelog file for #2510


  Commit: d0ecfdf00f951714058b629b21719cac2ab53c75
      https://github.com/pytest-dev/pytest/commit/d0ecfdf00f951714058b629b21719cac2ab53c75
  Author: Segev Finer <segev208 at gmail.com>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Delete trailing whitespace


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

  Changed paths:
    M _pytest/capture.py
    A changelog/2510.bugfix

  Log Message:
  -----------
  Merge pull request #2611 from segevfiner/patch-1

Early import colorama so that it get's the correct terminal


Compare: https://github.com/pytest-dev/pytest/compare/81ad185f0d0b...e44284c12574