Skip to content

Commit

Permalink
Fix code style
Browse files Browse the repository at this point in the history
  • Loading branch information
janbuchar committed Apr 15, 2019
1 parent b7be704 commit 8a319f9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
28 changes: 16 additions & 12 deletions apistrap/aiohttp.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from itertools import chain
from os import path
from pathlib import Path
from typing import Any, Callable, Coroutine, Optional, Tuple, Type, List
from typing import Any, Callable, Coroutine, List, Optional, Tuple, Type

import jinja2
from aiohttp import web
Expand Down Expand Up @@ -288,10 +288,10 @@ def _parse_parameter_value(self, parameter: inspect.Parameter, value: str):
if parameter.annotation == inspect.Parameter.empty:
return value

if parameter.annotation == str or parameter.annotation == 'str':
if parameter.annotation == str or parameter.annotation == "str":
return value

if parameter.annotation == int or parameter.annotation == 'int':
if parameter.annotation == int or parameter.annotation == "int":
return int(value)

return value
Expand All @@ -307,20 +307,24 @@ def _process_route_parameters(self, route: AbstractRoute) -> None:
signature = inspect.signature(route.handler)

request_param: Optional[inspect.Parameter] = next(
filter(lambda p: issubclass(p.annotation, BaseRequest), signature.parameters.values()),
None
filter(lambda p: issubclass(p.annotation, BaseRequest), signature.parameters.values()), None
)

if not request_param and "request" in signature.parameters.keys() \
and signature.parameters["request"].annotation == inspect.Signature.empty:
if (
not request_param
and "request" in signature.parameters.keys()
and signature.parameters["request"].annotation == inspect.Signature.empty
):
request_param = signature.parameters["request"]

takes_aiohttp_request = request_param is not None

additional_params: [inspect.Parameter] = [*filter(
lambda p: not takes_aiohttp_request or signature.parameters[p] != request_param,
signature.parameters.keys()
)]
additional_params: [inspect.Parameter] = [
*filter(
lambda p: not takes_aiohttp_request or signature.parameters[p] != request_param,
signature.parameters.keys(),
)
]

if not takes_aiohttp_request or additional_params:
handler = route.handler
Expand Down Expand Up @@ -368,7 +372,7 @@ def _extract_operation_spec(self, route: AbstractRoute) -> dict:
"in": "path",
"name": param_name,
"required": True,
"schema": {"type": self._parameter_annotation_to_openapi_type(annotation)}
"schema": {"type": self._parameter_annotation_to_openapi_type(annotation)},
}

if param_name in param_doc.keys():
Expand Down
4 changes: 2 additions & 2 deletions apistrap/extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def _summary_from_docblock(self, docblock: Optional[str]) -> str:
lines = [*map(lambda line: line.strip(), docblock.strip().splitlines())]

if "" in lines:
lines = lines[:lines.index("")]
lines = lines[: lines.index("")]

return "\n".join(lines)

Expand All @@ -172,7 +172,7 @@ def _parameters_from_docblock(self, docblock: Optional[str]) -> Dict[str, str]:
result = {}

if "" in lines:
for line in lines[lines.index(""):]:
for line in lines[lines.index("") :]:
match = re.match(r"^:param\s+([^:]+):\s+(.+)", line)
if match is not None:
result[match.group(1)] = match.group(2)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_aiohttp_docblocks.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
import json

import pytest
from aiohttp import web

from apistrap.aiohttp import AioHTTPApistrap
Expand Down
2 changes: 1 addition & 1 deletion tests/test_aiohttp_path_params.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json

from aiohttp import web
import pytest
from aiohttp import web

from apistrap.aiohttp import AioHTTPApistrap

Expand Down

0 comments on commit 8a319f9

Please sign in to comment.