From 3d0717813a73d33cb932686498ff7f257ea3b916 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sun, 3 Jun 2018 11:54:36 -0700
Subject: [PATCH 1/4] bytes() is a builtin in python2.6+

---
 testing/test_assertion.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/test_assertion.py b/testing/test_assertion.py
index 6cf5b5313..393cf817c 100644
--- a/testing/test_assertion.py
+++ b/testing/test_assertion.py
@@ -546,9 +546,9 @@ class TestAssert_reprcompare(object):
         # issue 429
         left = "e"
         right = "\xc3\xa9"
-        if not isinstance(left, py.builtin.bytes):
-            left = py.builtin.bytes(left, "utf-8")
-            right = py.builtin.bytes(right, "utf-8")
+        if not isinstance(left, bytes):
+            left = bytes(left, "utf-8")
+            right = bytes(right, "utf-8")
         expl = callequal(left, right)
         for line in expl:
             assert isinstance(line, py.builtin.text)

From 04f08b67a47074edf2c171111e61dbfdd8a8bb6a Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sun, 3 Jun 2018 11:57:32 -0700
Subject: [PATCH 2/4] __code__ and __self__ are attributes in python2.6+

---
 src/_pytest/compat.py   | 2 +-
 src/_pytest/fixtures.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py
index e4072ecdb..7abd3d53f 100644
--- a/src/_pytest/compat.py
+++ b/src/_pytest/compat.py
@@ -83,7 +83,7 @@ def iscoroutinefunction(func):
 
 def getlocation(function, curdir):
     fn = py.path.local(inspect.getfile(function))
-    lineno = py.builtin._getcode(function).co_firstlineno
+    lineno = function.__code__.co_firstlineno
     if fn.relto(curdir):
         fn = fn.relto(curdir)
     return "%s:%d" % (fn, lineno + 1)
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
index bfae4cb61..495e6b9b3 100644
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -354,8 +354,7 @@ class FixtureRequest(FuncargnamesCompatAttr):
             return self._pyfuncitem._testcase
         except AttributeError:
             function = getattr(self, "function", None)
-            if function is not None:
-                return py.builtin._getimself(function)
+            return getattr(function, "__self__", None)
 
     @scopeproperty()
     def module(self):

From ff19f273a9cc04271c17e81d74eec9bc8e2410ef Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sun, 3 Jun 2018 11:57:53 -0700
Subject: [PATCH 3/4] Use six to import queue instead of py.builtin._tryimport

---
 testing/code/test_excinfo.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py
index 463b2e38e..f4044b6ec 100644
--- a/testing/code/test_excinfo.py
+++ b/testing/code/test_excinfo.py
@@ -13,6 +13,7 @@ from _pytest._code.code import (
     ReprExceptionInfo,
     ExceptionChainRepr,
 )
+from six.moves import queue
 
 from test_source import astonly
 
@@ -23,8 +24,6 @@ except ImportError:
 else:
     invalidate_import_caches = getattr(importlib, "invalidate_caches", None)
 
-queue = py.builtin._tryimport("queue", "Queue")
-
 failsonjython = pytest.mark.xfail("sys.platform.startswith('java')")
 
 pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))

From 2f6555dfd3a49bb2d1551501a03a2c348d4533de Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sun, 3 Jun 2018 12:16:52 -0700
Subject: [PATCH 4/4] Add changelog entry

---
 changelog/3629.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/3629.trivial.rst

diff --git a/changelog/3629.trivial.rst b/changelog/3629.trivial.rst
new file mode 100644
index 000000000..b6bb73fd1
--- /dev/null
+++ b/changelog/3629.trivial.rst
@@ -0,0 +1 @@
+Remove some python2.5 compatibility code.