mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 06:50:52 +00:00
more bytes strings
Signed-off-by: Adrian Tschira <nota@notafile.com>
This commit is contained in:
parent
9558236728
commit
e9143b6593
4 changed files with 10 additions and 7 deletions
|
@ -286,7 +286,7 @@ def resolve_service(service_name, dns_client=client, cache=SERVER_CACHE, clock=t
|
||||||
if (len(answers) == 1
|
if (len(answers) == 1
|
||||||
and answers[0].type == dns.SRV
|
and answers[0].type == dns.SRV
|
||||||
and answers[0].payload
|
and answers[0].payload
|
||||||
and answers[0].payload.target == dns.Name('.')):
|
and answers[0].payload.target == dns.Name(b'.')):
|
||||||
raise ConnectError("Service %s unavailable" % service_name)
|
raise ConnectError("Service %s unavailable" % service_name)
|
||||||
|
|
||||||
for answer in answers:
|
for answer in answers:
|
||||||
|
|
|
@ -546,6 +546,6 @@ def _request_user_agent_is_curl(request):
|
||||||
b"User-Agent", default=[]
|
b"User-Agent", default=[]
|
||||||
)
|
)
|
||||||
for user_agent in user_agents:
|
for user_agent in user_agents:
|
||||||
if "curl" in user_agent:
|
if b"curl" in user_agent:
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
|
@ -81,15 +81,15 @@ class UploadResource(Resource):
|
||||||
headers = request.requestHeaders
|
headers = request.requestHeaders
|
||||||
|
|
||||||
if headers.hasHeader("Content-Type"):
|
if headers.hasHeader("Content-Type"):
|
||||||
media_type = headers.getRawHeaders("Content-Type")[0]
|
media_type = headers.getRawHeaders(b"Content-Type")[0]
|
||||||
else:
|
else:
|
||||||
raise SynapseError(
|
raise SynapseError(
|
||||||
msg="Upload request missing 'Content-Type'",
|
msg="Upload request missing 'Content-Type'",
|
||||||
code=400,
|
code=400,
|
||||||
)
|
)
|
||||||
|
|
||||||
# if headers.hasHeader("Content-Disposition"):
|
# if headers.hasHeader(b"Content-Disposition"):
|
||||||
# disposition = headers.getRawHeaders("Content-Disposition")[0]
|
# disposition = headers.getRawHeaders(b"Content-Disposition")[0]
|
||||||
# TODO(markjh): parse content-dispostion
|
# TODO(markjh): parse content-dispostion
|
||||||
|
|
||||||
content_uri = yield self.media_repo.create_content(
|
content_uri = yield self.media_repo.create_content(
|
||||||
|
|
|
@ -40,9 +40,12 @@ def create_resource_tree(desired_tree, root_resource):
|
||||||
# extra resources to existing nodes. See self._resource_id for the key.
|
# extra resources to existing nodes. See self._resource_id for the key.
|
||||||
resource_mappings = {}
|
resource_mappings = {}
|
||||||
for full_path, res in desired_tree.items():
|
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)
|
logger.info("Attaching %s to path %s", res, full_path)
|
||||||
last_resource = root_resource
|
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():
|
if path_seg not in last_resource.listNames():
|
||||||
# resource doesn't exist, so make a "dummy resource"
|
# resource doesn't exist, so make a "dummy resource"
|
||||||
child_resource = NoResource()
|
child_resource = NoResource()
|
||||||
|
@ -57,7 +60,7 @@ def create_resource_tree(desired_tree, root_resource):
|
||||||
|
|
||||||
# ===========================
|
# ===========================
|
||||||
# now attach the actual desired 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
|
# if there is already a resource here, thieve its children and
|
||||||
# replace it
|
# replace it
|
||||||
|
|
Loading…
Reference in a new issue