diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 11:50:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 11:50:14 +0100 |
| commit | d72f897f078fa72548522440149369293f0d12b2 (patch) | |
| tree | 4e8d692713f73389b89dea4fdba719b696c9f3af /synapse/rest/base.py | |
| parent | Reimplement the get public rooms api to work with new DB schema (diff) | |
| parent | Add a check to make sure that during state conflict res we only request a PDU... (diff) | |
| download | synapse-d72f897f078fa72548522440149369293f0d12b2.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/stream.py
Diffstat (limited to 'synapse/rest/base.py')
| -rw-r--r-- | synapse/rest/base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/base.py b/synapse/rest/base.py index 65d417f757..6a88cbe866 100644 --- a/synapse/rest/base.py +++ b/synapse/rest/base.py @@ -14,6 +14,7 @@ # limitations under the License. """ This module contains base REST classes for constructing REST servlets. """ +from synapse.api.urls import CLIENT_PREFIX import re @@ -27,7 +28,7 @@ def client_path_pattern(path_regex): Returns: SRE_Pattern """ - return re.compile("^/matrix/client/api/v1" + path_regex) + return re.compile("^" + CLIENT_PREFIX + path_regex) class RestServlet(object): |