--- pytest-3.6.3/testing/code/test_excinfo.py.orig	2018-07-04 23:23:50.000000000 +0200
+++ pytest-3.6.3/testing/code/test_excinfo.py	2018-07-18 05:46:24.873976914 +0200
@@ -371,7 +371,8 @@
     for item in excinfo.traceback:
         print(item)  # XXX: for some reason jinja.Template.render is printed in full
         item.source  # shouldnt fail
-        if item.path.basename == "test.txt":
+        from six import string_types
+        if not isinstance(item.path, string_types) and item.path.basename == "test.txt":
             assert str(item.source) == "{{ h()}}:"
 
 
--- pytest-4.6.11/testing/acceptance_test.py.orig	2020-06-05 14:09:02.000000000 +0200
+++ pytest-4.6.11/testing/acceptance_test.py	2020-09-15 19:53:44.014482984 +0200
@@ -145,6 +145,7 @@
             return (DummyDist(entry_points),)
 
         monkeypatch.setattr(importlib_metadata, "distributions", my_dists)
+        monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
         params = ("-p", "mycov") if load_cov_early else ()
         testdir.runpytest_inprocess(*params)
         if load_cov_early: