Merge pull request #1765 from The-Compiler/1763-cleanup

Cleanups for #1763

Author: RonnyPfannschmidt

CHANGELOG.rst

@@ -21,7 +21,7 @@
   e.g. with ``request.getfuncargvalue``. BACKWARD INCOMPAT: Previously these params
   were simply never defined. So a fixture decorated like ``@pytest.fixture(params=[0, 1, 2])``
   only ran once. Now a failure is raised. Fixes (`#460`_). Thanks to
-  `@nikratio`_ for bug report, `@RedBeardCode`_ and `@tomviner`_ for PR.
+  `@nikratio`_ for bug report, `@RedBeardCode`_ and `@tomviner`_ for the PR.
 
 * Create correct diff for strings ending with newlines. Fixes (`#1553`_).
   Thanks `@Vogtinator`_ for reporting. Thanks to `@RedBeardCode`_ and

_pytest/main.py

@@ -94,9 +94,8 @@ def wrap_session(config, doit):
             excinfo = _pytest._code.ExceptionInfo()
             if initstate < 2 and isinstance(
                     excinfo.value, pytest.exit.Exception):
-                excinfo = _pytest._code.ExceptionInfo()
                 sys.stderr.write('{0}: {1}\n'.format(
-                    type(excinfo.value).__name__, excinfo.value.msg))
+                    excinfo.typename, excinfo.value.msg))
             config.hook.pytest_keyboard_interrupt(excinfo=excinfo)
             session.exitstatus = EXIT_INTERRUPTED
         except: