From 77c1505ab529759c86c2c168c415ed05a635cebb Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Thu, 28 May 2020 16:34:40 -0700
Subject: Revert "Fix tests that depend on the test runner"

This reverts commit 72eca2f8e82f1af20e433218719d99e7627d5650.
---
 tests/test_path.py | 4 ++--
 tests/test_util.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/test_path.py b/tests/test_path.py
index c9cfde2b6..384460fb1 100644
--- a/tests/test_path.py
+++ b/tests/test_path.py
@@ -101,10 +101,10 @@ class TestCallerPackage(unittest.TestCase):
         self.assertEqual(result, tests)
 
     def test_it_level_3(self):
-        import _pytest
+        import unittest
 
         result = self._callFUT(3)
-        self.assertEqual(result, _pytest)
+        self.assertEqual(result, unittest)
 
     def test_it_package(self):
         import tests
diff --git a/tests/test_util.py b/tests/test_util.py
index 8ed082ee4..0fb975f66 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -492,7 +492,8 @@ class Test_object_description(unittest.TestCase):
     def test_method(self):
         self.assertEqual(
             self._callFUT(self.test_method),
-            'function tests.test_util.test_method',
+            'method test_method of class tests.test_util.'
+            'Test_object_description',
         )
 
     def test_class(self):
-- 
cgit v1.2.3


From 2315430153c7b0f1aab1007cc5c87456efef2ec1 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Thu, 28 May 2020 16:36:28 -0700
Subject: Pin minimum pytest version

---
 setup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1a334efe2..0596a0194 100644
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,11 @@ docs_extras = [
     'sphinxcontrib-autoprogram',
 ]
 
-testing_extras = tests_require + ['coverage', 'pytest', 'pytest-cov']
+testing_extras = tests_require + [
+    'coverage',
+    'pytest>=5.4.2',  # unittest.TestCase funkyness, see commit 77c1505ab
+    'pytest-cov',
+]
 
 branch_version = ".".join(VERSION.split(".")[:2])
 
-- 
cgit v1.2.3


From b19492dbbe5cebbabb91f01ae312d951b39ee931 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Thu, 28 May 2020 16:41:12 -0700
Subject: Fix linting errors

---
 src/pyramid/config/settings.py | 2 +-
 src/pyramid/i18n.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pyramid/config/settings.py b/src/pyramid/config/settings.py
index d47743ec7..076c455d4 100644
--- a/src/pyramid/config/settings.py
+++ b/src/pyramid/config/settings.py
@@ -78,7 +78,7 @@ def Settings(d=None, _environ_=os.environ, **kw):
         value = type_(value)
         d.update({k: value for k in keys})
 
-    def O(settings_key, override_key):  # noqa: E743
+    def O(settings_key, override_key):  # noqa: E743, E741
         for key in expand_key(settings_key):
             d[key] = d[key] or d[override_key]
 
diff --git a/src/pyramid/i18n.py b/src/pyramid/i18n.py
index 8c7d01d39..8bf091c58 100644
--- a/src/pyramid/i18n.py
+++ b/src/pyramid/i18n.py
@@ -263,7 +263,7 @@ class Translations(gettext.GNUTranslations):
         if locales is not None:
             if not isinstance(locales, (list, tuple)):
                 locales = [locales]
-            locales = [str(l) for l in locales]
+            locales = [str(locale) for locale in locales]
         if not domain:
             domain = cls.DEFAULT_DOMAIN
         filename = gettext.find(domain, dirname, locales)
-- 
cgit v1.2.3