diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
| commit | 6941a1971548ea8ba37130deeffe2a2e2cd88085 (patch) | |
| tree | 9b6947d42c18e4a7ccb9c4e34525faa8e073cf76 /synapse/streams/config.py | |
| parent | Begin fleshing out a new Event object (diff) | |
| parent | Fix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff) | |
| download | synapse-6941a1971548ea8ba37130deeffe2a2e2cd88085.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/streams/config.py')
| -rw-r--r-- | synapse/streams/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/streams/config.py b/synapse/streams/config.py index 0317e78c08..2114c940e7 100644 --- a/synapse/streams/config.py +++ b/synapse/streams/config.py @@ -47,7 +47,8 @@ class PaginationConfig(object): self.limit = int(limit) if limit is not None else None @classmethod - def from_request(cls, request, raise_invalid_params=True): + def from_request(cls, request, raise_invalid_params=True, + default_limit=None): def get_param(name, default=None): lst = request.args.get(name, []) if len(lst) > 1: @@ -84,6 +85,9 @@ class PaginationConfig(object): if limit is not None and not limit.isdigit(): raise SynapseError(400, "'limit' parameter must be an integer.") + if limit is None: + limit = default_limit + try: return PaginationConfig(from_tok, to_tok, direction, limit) except: |