mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
autopep8 et upload files
This commit is contained in:
1 parent
259f6249e2
commit
c9314ec509
16 files changed
+99
-24
No files matched your search
@@ -46,7 +46,7 @@ class Response(aiohttp.web.Response):
|
||||
log.debug("%s", request.json)
|
||||
log.info("Response: %d %s", self.status, self.reason)
|
||||
log.debug(dict(self.headers))
|
||||
if hasattr(self, 'body') and self.body is not None:
|
||||
if hasattr(self, 'body') and self.body is not None and self.headers["CONTENT-TYPE"] == "application/json":
|
||||
log.debug(json.loads(self.body.decode('utf-8')))
|
||||
return super().start(request)
|
||||
|
||||
@@ -90,3 +90,11 @@ class Response(aiohttp.web.Response):
|
||||
log.error("Invalid output query. JSON schema error: {}".format(e.message))
|
||||
raise aiohttp.web.HTTPBadRequest(text="{}".format(e))
|
||||
self.body = json.dumps(answer, indent=4, sort_keys=True).encode('utf-8')
|
||||
|
||||
def redirect(self, url):
|
||||
"""
|
||||
Redirect to url
|
||||
|
||||
:params url: Redirection URL
|
||||
"""
|
||||
raise aiohttp.web.HTTPFound(url)
|
||||
@@ -82,6 +82,8 @@ class Route(object):
|
||||
output_schema = kw.get("output", {})
|
||||
input_schema = kw.get("input", {})
|
||||
api_version = kw.get("api_version", 1)
|
||||
|
||||
# If it's a JSON api endpoint just register the endpoint an do nothing
|
||||
if api_version is None:
|
||||
cls._path = path
|
||||
else:
|
||||
@@ -107,6 +109,14 @@ class Route(object):
|
||||
@asyncio.coroutine
|
||||
def control_schema(request):
|
||||
# This block is executed at each method call
|
||||
|
||||
# Non API call
|
||||
if api_version is None:
|
||||
response = Response(route=route, output_schema=output_schema)
|
||||
yield from func(request, response)
|
||||
return response
|
||||
|
||||
# API call
|
||||
try:
|
||||
request = yield from parse_request(request, input_schema)
|
||||
response = Response(route=route, output_schema=output_schema)
|
||||
|
||||
Reference in new issue
Block a user