diff options
author | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
---|---|---|
committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
commit | 89dda613153c4869f3c9ce96f5cbc47f93f54723 (patch) | |
tree | 320e718965e5e843fe3950bd8c19cf4b9ad367a6 /synapse/util/httpresourcetree.py | |
parent | 0.27.3 (diff) | |
parent | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id (diff) | |
download | synapse-89dda613153c4869f3c9ce96f5cbc47f93f54723.tar.xz |
Merge branch 'develop' into release-v0.27.0
Diffstat (limited to 'synapse/util/httpresourcetree.py')
-rw-r--r-- | synapse/util/httpresourcetree.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/httpresourcetree.py b/synapse/util/httpresourcetree.py index 45be47159a..d747849553 100644 --- a/synapse/util/httpresourcetree.py +++ b/synapse/util/httpresourcetree.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from twisted.web.resource import Resource +from twisted.web.resource import NoResource import logging @@ -45,7 +45,7 @@ def create_resource_tree(desired_tree, root_resource): for path_seg in full_path.split('/')[1:-1]: if path_seg not in last_resource.listNames(): # resource doesn't exist, so make a "dummy resource" - child_resource = Resource() + child_resource = NoResource() last_resource.putChild(path_seg, child_resource) res_id = _resource_id(last_resource, path_seg) resource_mappings[res_id] = child_resource |