diff options
author | Adrian Tschira <nota@notafile.com> | 2018-04-28 23:56:59 +0200 |
---|---|---|
committer | Adrian Tschira <nota@notafile.com> | 2018-04-29 00:13:57 +0200 |
commit | e9143b659352e87fd9e26c8e5a771c78011bc945 (patch) | |
tree | 18d53d291157b9e9eb69b8bdb405ccfaf51e1135 /synapse/util | |
parent | Merge pull request #3127 from matrix-org/rav/deferred_timeout (diff) | |
download | synapse-e9143b659352e87fd9e26c8e5a771c78011bc945.tar.xz |
more bytes strings
Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/util')
-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 d747849553..e9f0f292ee 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 |