diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-04-01 16:20:09 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-01 16:20:09 +0100 |
| commit | 89e6839a487fdcf048b11481137c0c73ffa4f167 (patch) | |
| tree | 6e45dccf9d58a596952457b73890178af973a6f0 /synapse/push | |
| parent | Merge pull request #684 from matrix-org/markjh/backfill_id_gen (diff) | |
| parent | Use google style doc strings. (diff) | |
| download | synapse-89e6839a487fdcf048b11481137c0c73ffa4f167.tar.xz | |
Merge pull request #686 from matrix-org/markjh/doc_strings
Use google style doc strings.
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/baserules.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index 792af70eb7..6add94beeb 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -19,9 +19,11 @@ import copy def list_with_base_rules(rawrules): """Combine the list of rules set by the user with the default push rules - :param list rawrules: The rules the user has modified or set. - :returns: A new list with the rules set by the user combined with the - defaults. + Args: + rawrules(list): The rules the user has modified or set. + + Returns: + A new list with the rules set by the user combined with the defaults. """ ruleslist = [] |