summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2016-09-09 14:54:16 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2016-09-09 14:54:16 +0100
commitf25d74f69c7da9bd36ba953d916dd78f7ea79ff1 (patch)
tree7f243546ca1d66d1a8811579e8df3612ded265f7
parentappease pep8 (diff)
downloadsynapse-f25d74f69c7da9bd36ba953d916dd78f7ea79ff1.tar.xz
Minor fixes from PR comments
-rw-r--r--synapse/handlers/appservice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index a0375f7e3b..4648e78d47 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -199,12 +199,12 @@ class ApplicationServicesHandler(object):
                 protocols[p].append(info)
 
         def _merge_instances(infos):
-            if len(infos) == 0:
+            if not infos:
                 return {}
 
             # Merge the 'instances' lists of multiple results, but just take
             # the other fields from the first as they ought to be identical
-            # deep-clone the result so as not to corrupt the cached one
+            # copy the result so as not to corrupt the cached one
             combined = dict(infos[0])
             combined["instances"] = list(combined["instances"])