summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-01-28 14:44:41 +0000
committerDavid Baker <dave@matrix.org>2015-01-28 14:44:41 +0000
commit0cbb6b0f5235e4501a0fb360e881d152644a17cd (patch)
tree667f5d5d544381a236797f1b3dde57f46e254a58
parentspaces (diff)
downloadsynapse-0cbb6b0f5235e4501a0fb360e881d152644a17cd.tar.xz
Google doc style
-rw-r--r--synapse/storage/_base.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 4f172d3967..809c81f47f 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -195,10 +195,11 @@ class SQLBaseStore(object):
 
     def _simple_upsert(self, table, keyvalues, values):
         """
-        :param table: The table to upsert into
-        :param keyvalues: Dict of the unique key tables and their new values
-        :param values: Dict of all the nonunique columns and their new values
-        :return: A deferred
+        Args:
+            table (str): The table to upsert into
+            keyvalues (dict): The unique key tables and their new values
+            values (dict): The nonunique columns and their new values
+        Returns: A deferred
         """
         return self.runInteraction(
             "_simple_upsert",