Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-27 10:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove iteritems() calls

Browse source
This commit is contained in:
Griatch 2018-10-13 19:49:24 +02:00
parent ede65d09d0
commit 2417fdf197
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/contrib/security/auditing/server.py
View file

@ -155,9 +155,9 @@ class AuditedServerSession(ServerSession):
# Remove any keys with blank values
if AUDIT_ALLOW_SPARSE is False:
log['data'] = {k: v for k, v in log['data'].iteritems() if v}
log['objects'] = {k: v for k, v in log['objects'].iteritems() if v}
log = {k: v for k, v in log.iteritems() if v}
log['data'] = {k: v for k, v in log['data'].items() if v}
log['objects'] = {k: v for k, v in log['objects'].items() if v}
log = {k: v for k, v in log.items() if v}
return log
@ -183,7 +183,7 @@ class AuditedServerSession(ServerSession):
is_embedded = True
for mask in AUDIT_MASKS:
for command, regex in mask.iteritems():
for command, regex in mask.items():
try:
match = re.match(regex, msg, flags=re.IGNORECASE)
except Exception as e:

2
evennia/contrib/security/auditing/tests.py
View file

@ -80,7 +80,7 @@ class AuditingTest(EvenniaTest):
parsed from the Session object.
"""
log = self.session.audit(src='client', text=[['hello']])
obj = {k:v for k,v in log.iteritems() if k in ('direction', 'protocol', 'application', 'text')}
obj = {k:v for k,v in log.items() if k in ('direction', 'protocol', 'application', 'text')}
self.assertEqual(obj, {
'direction': 'RCV',
'protocol': 'telnet',

2
evennia/objects/objects.py
View file

@ -1505,7 +1505,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
if users or things:
# handle pluralization of things (never pluralize users)
thing_strings = []
for key, itemlist in sorted(things.iteritems()):
for key, itemlist in sorted(things.items()):
nitem = len(itemlist)
if nitem == 1:
key, _ = itemlist[0].get_numbered_name(nitem, looker, key=key)