From 2417fdf19708cbb01c2be38f3d2474f2aeac2ff5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 13 Oct 2018 19:49:24 +0200
Subject: [PATCH] Remove iteritems() calls

---
 evennia/contrib/security/auditing/server.py | 8 ++++----
 evennia/contrib/security/auditing/tests.py  | 2 +-
 evennia/objects/objects.py                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/evennia/contrib/security/auditing/server.py b/evennia/contrib/security/auditing/server.py
index 07bf24ccc5..89efbe53ec 100644
--- a/evennia/contrib/security/auditing/server.py
+++ b/evennia/contrib/security/auditing/server.py
@@ -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:
diff --git a/evennia/contrib/security/auditing/tests.py b/evennia/contrib/security/auditing/tests.py
index 4a522925eb..bd825701c2 100644
--- a/evennia/contrib/security/auditing/tests.py
+++ b/evennia/contrib/security/auditing/tests.py
@@ -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',
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 97a99ad53d..81302a06f0 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -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)