From 7099ea9bb0a4fa2b03d3793729bf7cf3254aa04f Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Wed, 22 Aug 2018 19:28:42 -0700
Subject: [PATCH] py.builtin._reraise -> six.reraise

---
 src/_pytest/fixtures.py      | 4 ++--
 src/_pytest/runner.py        | 8 ++++----
 testing/code/test_excinfo.py | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
index cc8921e65..c12691caa 100644
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -858,7 +858,7 @@ class FixtureDef(object):
             if exceptions:
                 e = exceptions[0]
                 del exceptions  # ensure we don't keep all frames alive because of the traceback
-                py.builtin._reraise(*e)
+                six.reraise(*e)
 
         finally:
             hook = self._fixturemanager.session.gethookproxy(request.node.fspath)
@@ -885,7 +885,7 @@ class FixtureDef(object):
             result, cache_key, err = cached_result
             if my_cache_key == cache_key:
                 if err is not None:
-                    py.builtin._reraise(*err)
+                    six.reraise(*err)
                 else:
                     return result
             # we have a previous but differently parametrized fixture instance
diff --git a/src/_pytest/runner.py b/src/_pytest/runner.py
index 5739bbef0..1ba9ff310 100644
--- a/src/_pytest/runner.py
+++ b/src/_pytest/runner.py
@@ -6,7 +6,7 @@ import os
 import sys
 from time import time
 
-import py
+import six
 from _pytest._code.code import ExceptionInfo
 from _pytest.outcomes import skip, Skipped, TEST_OUTCOME
 
@@ -317,7 +317,7 @@ class SetupState(object):
                 if exc is None:
                     exc = sys.exc_info()
         if exc:
-            py.builtin._reraise(*exc)
+            six.reraise(*exc)
 
     def _teardown_with_finalization(self, colitem):
         self._callfinalizers(colitem)
@@ -352,7 +352,7 @@ class SetupState(object):
                 if exc is None:
                     exc = sys.exc_info()
         if exc:
-            py.builtin._reraise(*exc)
+            six.reraise(*exc)
 
     def prepare(self, colitem):
         """ setup objects along the collector chain to the test-method
@@ -363,7 +363,7 @@ class SetupState(object):
         # check if the last collection node has raised an error
         for col in self.stack:
             if hasattr(col, "_prepare_exc"):
-                py.builtin._reraise(*col._prepare_exc)
+                six.reraise(*col._prepare_exc)
         for col in needed_collectors[len(self.stack) :]:
             self.stack.append(col)
             try:
diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py
index f4fe9bd53..f8bf25b68 100644
--- a/testing/code/test_excinfo.py
+++ b/testing/code/test_excinfo.py
@@ -252,7 +252,7 @@ class TestTraceback_f_g_h(object):
             import sys
 
             exc, val, tb = sys.exc_info()
-            py.builtin._reraise(exc, val, tb)
+            six.reraise(exc, val, tb)
 
         def f(n):
             try: