diff options
author | Erik Johnston <erik@matrix.org> | 2018-05-16 17:39:07 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-05-16 17:39:07 +0100 |
commit | 79d57d6d7d014d538ced535e12d03536c6f4b614 (patch) | |
tree | d5bb5f98a4a2dd4874d44371fb34b3deaec48ab0 /synapse/util/httpresourcetree.py | |
parent | d783486c9bde60abbb1f064258c2c3a36a107122 (diff) |
New upstream version 0.29.0
Diffstat (limited to 'synapse/util/httpresourcetree.py')
-rw-r--r-- | synapse/util/httpresourcetree.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/util/httpresourcetree.py b/synapse/util/httpresourcetree.py index d7478495..e9f0f292 100644 --- a/synapse/util/httpresourcetree.py +++ b/synapse/util/httpresourcetree.py @@ -40,9 +40,12 @@ def create_resource_tree(desired_tree, root_resource): # extra resources to existing nodes. See self._resource_id for the key. resource_mappings = {} for full_path, res in desired_tree.items(): + # twisted requires all resources to be bytes + full_path = full_path.encode("utf-8") + logger.info("Attaching %s to path %s", res, full_path) last_resource = root_resource - for path_seg in full_path.split('/')[1:-1]: + for path_seg in full_path.split(b'/')[1:-1]: if path_seg not in last_resource.listNames(): # resource doesn't exist, so make a "dummy resource" child_resource = NoResource() @@ -57,7 +60,7 @@ def create_resource_tree(desired_tree, root_resource): # =========================== # now attach the actual desired resource - last_path_seg = full_path.split('/')[-1] + last_path_seg = full_path.split(b'/')[-1] # if there is already a resource here, thieve its children and # replace it |