Merge branch 'release-v1.20.0' into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/unittest.py b/tests/unittest.py

index 7b80999a74..3cb55a7e96 100644
--- a/tests/unittest.py
+++ b/tests/unittest.py
@@ -614,7 +614,7 @@ class FederatingHomeserverTestCase(HomeserverTestCase):
     """
 
     def prepare(self, reactor, clock, homeserver):
-        class Authenticator(object):
+        class Authenticator:
             def authenticate_request(self, request, content):
                 return succeed("other.example.com")