merge upstream

6 files changed, 10 insertions, 6 deletions

diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index 710e87423..cb2a0a035 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -398,7 +398,7 @@ class TestRepozeWho1AuthenticationPolicy(unittest.TestCase):
         self.assertEqual(policy.effective_principals(request), [Everyone])
 
     def test_effective_principals_repoze_who_userid_is_unclean_Authenticated(
-        self
+        self,
     ):
         from pyramid.security import Everyone
 
diff --git a/tests/test_router.py b/tests/test_router.py
index 722f4286c..f6b7f64d3 100644
--- a/tests/test_router.py
+++ b/tests/test_router.py
@@ -434,7 +434,7 @@ class TestRouter(unittest.TestCase):
         self.assertEqual(request.root, context)
 
     def test_call_view_registered_nonspecific_nondefault_path_and_subpath(
-        self
+        self,
     ):
         from pyramid.interfaces import IViewClassifier
 
diff --git a/tests/test_session.py b/tests/test_session.py
index 8e5e82bb2..582a7ed4a 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -564,6 +564,10 @@ class Test_manage_changed(unittest.TestCase):
 
 
 class TestPickleSerializer(unittest.TestCase):
+    """
+    .. deprecated:: 2.0
+    """
+
     def _makeOne(self):
         from pyramid.session import PickleSerializer
 
diff --git a/tests/test_testing.py b/tests/test_testing.py
index d0f23a116..ad1fca1d9 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -55,7 +55,7 @@ class TestDummyResource(unittest.TestCase):
         return klass(name, parent, **kw)
 
     def test__setitem__and__getitem__and__delitem__and__contains__and_get(
-        self
+        self,
     ):
         class Dummy:
             pass
diff --git a/tests/test_traversal.py b/tests/test_traversal.py
index 188ee803c..fdb0bcbb7 100644
--- a/tests/test_traversal.py
+++ b/tests/test_traversal.py
@@ -1270,8 +1270,8 @@ class DummyContext(object):
 class DummyRequest:
 
     application_url = (
-        'http://example.com:5432'
-    )  # app_url never ends with slash
+        'http://example.com:5432'  # app_url never ends with slash
+    )
     matchdict = None
     matched_route = None
 
diff --git a/tests/test_url.py b/tests/test_url.py
index 648f48d53..c5c0ca09f 100644
--- a/tests/test_url.py
+++ b/tests/test_url.py
@@ -940,7 +940,7 @@ class TestURLMethodsMixin(unittest.TestCase):
         self.assertEqual(result, 'http://example.com:8080')
 
     def test_partial_application_url_with_http_host_nondefault_port_https(
-        self
+        self,
     ):
         environ = {'wsgi.url_scheme': 'https', 'HTTP_HOST': 'example.com:4443'}
         request = self._makeOne(environ)