[Pytest-commit] [pytest-dev/pytest] ec2d82: Fix issue #3372

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: ec2d8223cff2fe83119d142c3b4b365786b3182d
      https://github.com/pytest-dev/pytest/commit/ec2d8223cff2fe83119d142c3b4b365786b3182d
  Author: Tim Strazny <tim.strazny at energymeteo.de>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M AUTHORS
    M _pytest/python_api.py
    A changelog/3372.bugfix.rst
    M testing/python/raises.py

  Log Message:
  -----------
  Fix issue #3372


  Commit: 0cd74dc3243877dcb5e0d266e6a1e9862c60f207
      https://github.com/pytest-dev/pytest/commit/0cd74dc3243877dcb5e0d266e6a1e9862c60f207
  Author: Tim Strazny <tim.strazny at energymeteo.de>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Ensure object is class before calling issubclass.


  Commit: 846d91fb95cc27c3a8b4ca50317a7de0bc0c510e
      https://github.com/pytest-dev/pytest/commit/846d91fb95cc27c3a8b4ca50317a7de0bc0c510e
  Author: Tim Strazny <tim.strazny at energymeteo.de>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  Follow Ronny's advice and use ``type`` in ``base_type``.


  Commit: 5bd85610163df47dfe5070532c09268032dc4b42
      https://github.com/pytest-dev/pytest/commit/5bd85610163df47dfe5070532c09268032dc4b42
  Author: Tim Strazny <tim.strazny at energymeteo.de>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M _pytest/python_api.py

  Log Message:
  -----------
  linting: unfortunate dedent be gone.


  Commit: e012dbe346d724d91993068c6f5cb15423bb167e
      https://github.com/pytest-dev/pytest/commit/e012dbe346d724d91993068c6f5cb15423bb167e
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
    M AUTHORS
    M _pytest/python_api.py
    A changelog/3372.bugfix.rst
    M testing/python/raises.py

  Log Message:
  -----------
  Merge pull request #3373 from backbord/master

Fix issue #3372


Compare: https://github.com/pytest-dev/pytest/compare/5d4fe87b729b...e012dbe346d7