diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
| commit | a28d0667329a65b6c187a85befd4f95f89a550b0 (patch) | |
| tree | e8b44087781b8707c458f9b886effd09f5ad9990 /synapse/push/baserules.py | |
| parent | Tests (diff) | |
| parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
| download | synapse-a28d0667329a65b6c187a85befd4f95f89a550b0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache
Diffstat (limited to 'synapse/push/baserules.py')
| -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 = [] |