Kolab Groupware OBS

Changes of Revision 9

bonnie-0.3.7.tar.gz/bonnie/worker/storage/elasticsearch_storage.py Changed

@@ -216,15 +216,16 @@
         return ret
 
     def select(
-            self,
-            query,
-            index=None,
-            doctype=None,
-            stored_fields=None,
-            sortby=None,
-            limit=None,
-            **kw
-        ):
+                self,
+                query,
+                index=None,
+                doctype=None,
+                stored_fields=None,
+                sortby=None,
+                limit=None,
+                **kw
+            ):
+
         """
             Standard API for querying storage
 
@@ -455,13 +456,16 @@
                         tzutc()
                     ).strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
 
-                'metadata': list(set(k, v for k, v in notification['metadata']),
+                'metadata': list(set(
+                        {
+                            k: v
+                        } for k, v in notification['metadata']
+                    )),
                 'acl': list(set(
-                        (
-                            self.resolve_username(k, force=True),
-                            v
-                        ) for k, v in notification['acl'].iteritems()
-                    ),
+                        {
+                            self.resolve_username(k, force=True): v
+                        } for k, v in notification['acl'].iteritems()
+                    )),
 
                 'folder_type': folder_type,
 
@@ -538,18 +542,18 @@
         # create an entry for the referenced imap folder
         if existing is None:
             log.debug(
-                    "Create folder object for: %r" % (
-                            folder['body']['uri']
-                        ),
-                    level = 8
-                )
+                "Create folder object for: %r" % (
+                    folder['body']['uri']
+                ),
+                level=8
+            )
 
             ret = self.set(
-                    index = self.folders_index,
-                    doctype = self.folders_doctype,
-                    key = folder['id'],
-                    value = folder['body']
-                )
+                index=self.folders_index,
+                doctype=self.folders_doctype,
+                key=folder['id'],
+                value=folder['body']
+            )
 
             if ret is None:
                 folder = None
@@ -560,16 +564,16 @@
 
             try:
                 ret = self.es.update(
-                        index = self.folders_index,
-                        doc_type = self.folders_doctype,
-                        id = folder['id'],
-                        body = {
-                                'doc': {
-                                        'name': folder['body']['name'],
-                                        'uri': folder['body']['uri']
-                                    }
-                            }
-                    )
+                    index=self.folders_index,
+                    doc_type=self.folders_doctype,
+                    id=folder['id'],
+                    body={
+                        'doc': {
+                            'name': folder['body']['name'],
+                            'uri': folder['body']['uri']
+                        }
+                    }
+                )
 
                 log.debug("Updated folder object: %r" % (ret), level=8)