Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-08-19 12:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix typos and needless try/except from PR review

Browse source
This commit is contained in:
Matthew Hodgson 2016-04-11 10:39:16 +01:00
parent 83b2f83da0
commit 5ffacc5e84
1 changed files with 137 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
synapse/rest/media/v1/preview_url_resource.py
View file

@ -54,7 +54,7 @@ class PreviewUrlResource(BaseMediaResource):
if html: if html:
pass pass
except: except:
raise RunTimeError("Disabling PreviewUrlResource as lxml not available") raise RuntimeError("Disabling PreviewUrlResource as lxml not available")
if not hasattr(hs.config, "url_preview_ip_range_blacklist"): if not hasattr(hs.config, "url_preview_ip_range_blacklist"):
logger.warn( logger.warn(
@ -62,7 +62,7 @@ class PreviewUrlResource(BaseMediaResource):
"blacklist in url_preview_ip_range_blacklist for url previewing " "blacklist in url_preview_ip_range_blacklist for url previewing "
"to work" "to work"
) )
raise RunTimeError( raise RuntimeError(
"Disabling PreviewUrlResource as " "Disabling PreviewUrlResource as "
"url_preview_ip_range_blacklist not specified" "url_preview_ip_range_blacklist not specified"
) )
@ -91,7 +91,6 @@ class PreviewUrlResource(BaseMediaResource):
@defer.inlineCallbacks @defer.inlineCallbacks
def _async_render_GET(self, request): def _async_render_GET(self, request):
try:
# XXX: if get_user_by_req fails, what should we do in an async render? # XXX: if get_user_by_req fails, what should we do in an async render?
requester = yield self.auth.get_user_by_req(request) requester = yield self.auth.get_user_by_req(request)
url = request.args.get("url")[0] url = request.args.get("url")[0]
@ -240,8 +239,6 @@ class PreviewUrlResource(BaseMediaResource):
) )
respond_with_json_bytes(request, 200, json.dumps(og), send_cors=True) respond_with_json_bytes(request, 200, json.dumps(og), send_cors=True)
except Exception as e:
raise e
@defer.inlineCallbacks @defer.inlineCallbacks