summary refs log tree commit diff
path: root/synapse/rest/client/v1/base.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-12-03 12:19:12 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-12-03 12:19:12 +0000
commitac213c2e08bb65b451e1dd3c3f21a70e3b2fd671 (patch)
treea2ea5203838e99c1218c5da56c1d263434080cba /synapse/rest/client/v1/base.py
parentMerge pull request #418 from matrix-org/daniel/whois (diff)
parentUpdate endpoints to reflect current spec (diff)
downloadsynapse-ac213c2e08bb65b451e1dd3c3f21a70e3b2fd671.tar.xz
Merge pull request #415 from matrix-org/daniel/endpoints
Merge pull request #415 from matrix-org/daniel/endpoints
Diffstat (limited to 'synapse/rest/client/v1/base.py')
-rw-r--r--synapse/rest/client/v1/base.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/base.py b/synapse/rest/client/v1/base.py
index 7ae3839a19..6273ce0795 100644
--- a/synapse/rest/client/v1/base.py
+++ b/synapse/rest/client/v1/base.py
@@ -27,7 +27,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def client_path_patterns(path_regex, releases=(0,)):
+def client_path_patterns(path_regex, releases=(0,), include_in_unstable=True):
     """Creates a regex compiled client path with the correct client path
     prefix.
 
@@ -38,8 +38,9 @@ def client_path_patterns(path_regex, releases=(0,)):
         SRE_Pattern
     """
     patterns = [re.compile("^" + CLIENT_PREFIX + path_regex)]
-    unstable_prefix = CLIENT_PREFIX.replace("/api/v1", "/unstable")
-    patterns.append(re.compile("^" + unstable_prefix + path_regex))
+    if include_in_unstable:
+        unstable_prefix = CLIENT_PREFIX.replace("/api/v1", "/unstable")
+        patterns.append(re.compile("^" + unstable_prefix + path_regex))
     for release in releases:
         new_prefix = CLIENT_PREFIX.replace("/api/v1", "/r%d" % release)
         patterns.append(re.compile("^" + new_prefix + path_regex))