summary refs log tree commit diff
path: root/synapse/api/errors.py
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-15 16:51:07 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-15 20:39:43 +0200
commit36c59ce66908a770b580c95bee0dd3aaf9906f0e (patch)
tree6a4190850b20083b4637276bc72e49d1fc2a4a53 /synapse/api/errors.py
parentMerge branch 'master' of https://github.com/matrix-org/synapse into develop (diff)
downloadsynapse-36c59ce66908a770b580c95bee0dd3aaf9906f0e.tar.xz
Use six.itervalues in some places
There's more where that came from

Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/api/errors.py')
-rw-r--r--synapse/api/errors.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index bee59e80dd..a9ff5576f3 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -18,6 +18,7 @@
 import logging
 
 import simplejson as json
+from six import iteritems
 
 logger = logging.getLogger(__name__)
 
@@ -297,7 +298,7 @@ def cs_error(msg, code=Codes.UNKNOWN, **kwargs):
         A dict representing the error response JSON.
     """
     err = {"error": msg, "errcode": code}
-    for key, value in kwargs.iteritems():
+    for key, value in iteritems(kwargs):
         err[key] = value
     return err