work in Python 3

synapse/handlers/e2e_keys.py

@@ -372,7 +372,7 @@ class E2eKeysHandler(object):
             if user_id not in attested_users:
                 attested_users[user_id] = []
             attested_users[user_id].append(attestation["device_id"])
-        for user_id, devices in attested_users.iteritems():
+        for user_id, devices in attested_users.items():
             if req_user_id == user_id:
                 # when making an attestation on your own device, notify
                 # everyone who shares a room with you.  This is the same as the

synapse/storage/end_to_end_keys.py

@@ -298,7 +298,7 @@ class EndToEndKeyStore(SQLBaseStore):
                         "attestation": json.dumps(x),
                     }
                     for x in attestations
-                    for from_user_id in x["signatures"].iterkeys()
+                    for from_user_id in x["signatures"].keys()
                 ],
             )
         return self.runInteraction(