Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-01 04:56:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace iteritems/itervalues/iterkeys with native versions. (#7692)

Browse source
This commit is contained in:
Patrick Cloke 2020-06-15 07:03:36 -04:00 • committed by GitHub
parent 2d11ea385c
commit bd6dc17221
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 184 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

13
synapse/storage/database.py
View file

@ -29,7 +29,6 @@ from typing import (
TypeVar,
)
from six import iteritems, iterkeys, itervalues
from six.moves import intern, range
from prometheus_client import Histogram
@ -259,7 +258,7 @@ class PerformanceCounters(object):
def interval(self, interval_duration_secs, limit=3):
counters = []
for name, (count, cum_time) in iteritems(self.current_counters):
for name, (count, cum_time) in self.current_counters.items():
prev_count, prev_time = self.previous_counters.get(name, (0, 0))
counters.append(
(
@ -1053,7 +1052,7 @@ class Database(object):
sql = ("SELECT %(retcol)s FROM %(table)s") % {"retcol": retcol, "table": table}
if keyvalues:
sql += " WHERE %s" % " AND ".join("%s = ?" % k for k in iterkeys(keyvalues))
sql += " WHERE %s" % " AND ".join("%s = ?" % k for k in keyvalues.keys())
txn.execute(sql, list(keyvalues.values()))
else:
txn.execute(sql)
@ -1191,7 +1190,7 @@ class Database(object):
clause, values = make_in_list_sql_clause(txn.database_engine, column, iterable)
clauses = [clause]
for key, value in iteritems(keyvalues):
for key, value in keyvalues.items():
clauses.append("%s = ?" % (key,))
values.append(value)
@ -1212,7 +1211,7 @@ class Database(object):
@staticmethod
def simple_update_txn(txn, table, keyvalues, updatevalues):
if keyvalues:
where = "WHERE %s" % " AND ".join("%s = ?" % k for k in iterkeys(keyvalues))
where = "WHERE %s" % " AND ".join("%s = ?" % k for k in keyvalues.keys())
else:
where = ""
@ -1351,7 +1350,7 @@ class Database(object):
clause, values = make_in_list_sql_clause(txn.database_engine, column, iterable)
clauses = [clause]
for key, value in iteritems(keyvalues):
for key, value in keyvalues.items():
clauses.append("%s = ?" % (key,))
values.append(value)
@ -1388,7 +1387,7 @@ class Database(object):
txn.close()
if cache:
min_val = min(itervalues(cache))
min_val = min(cache.values())
else:
min_val = max_value