Skip to content

Commit 75af527

Browse files
author
ciaran
committed
fix with correct thirdparty
1 parent 490198a commit 75af527

26 files changed

+11
-37
lines changed

tests/aiohttp/test_aiohttp_api_secure.py

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from unittest.mock import MagicMock
33

44
import pytest
5-
65
from firetail import AioHttpApp
76

87

tests/aiohttp/test_aiohttp_app.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import pytest
77
from conftest import TEST_FOLDER
8-
98
from firetail import AioHttpApp
109
from firetail.exceptions import FiretailException
1110

tests/aiohttp/test_aiohttp_errors.py

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import aiohttp.test_utils
44
import pytest
5-
65
from firetail import AioHttpApp
76
from firetail.apis.aiohttp_api import HTTPStatus
87

tests/aiohttp/test_aiohttp_multipart.py

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import aiohttp
55
import pytest
6-
76
from firetail import AioHttpApp
87

98
try:

tests/aiohttp/test_aiohttp_reverse_proxy.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
from aiohttp import web
44
from aiohttp_remotes.exceptions import RemoteError, TooManyHeaders
55
from aiohttp_remotes.x_forwarded import XForwardedBase
6-
from yarl import URL
7-
86
from firetail import AioHttpApp
7+
from yarl import URL
98

109
X_FORWARDED_PATH = "X-Forwarded-Path"
1110

tests/aiohttp/test_aiohttp_simple_api.py

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import pytest
44
import yaml
55
from conftest import TEST_FOLDER
6-
76
from firetail import AioHttpApp
87

98
try:

tests/aiohttp/test_get_response.py

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import pytest
44
from aiohttp import web
5-
65
from firetail.apis.aiohttp_api import AioHttpApi
76
from firetail.lifecycle import FiretailResponse
87

tests/api/test_bootstrap.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import pytest
66
import yaml
77
from conftest import TEST_FOLDER, build_app_from_fixture
8-
98
from firetail import App
109
from firetail.exceptions import InvalidSpecification
1110
from firetail.http_facts import METHODS

tests/api/test_responses.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
from struct import unpack
33

44
import yaml
5-
from werkzeug.test import Client, EnvironBuilder
6-
75
from firetail.apps.flask_app import FlaskJSONEncoder
6+
from werkzeug.test import Client, EnvironBuilder
87

98

109
def test_app(simple_app):

tests/conftest.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import sys
55

66
import pytest
7-
87
from firetail import App
98
from firetail.security import FlaskSecurityHandlerFactory
109

tests/decorators/test_security.py

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import pytest
55
import requests
6-
76
from firetail.exceptions import (
87
BadRequestProblem,
98
FiretailException,

tests/decorators/test_uri_parsing.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import pytest
2-
from werkzeug.datastructures import MultiDict
3-
42
from firetail.decorators.uri_parsing import (
53
AlwaysMultiURIParser,
64
FirstValueURIParser,
75
OpenAPIURIParser,
86
Swagger2URIParser,
97
)
8+
from werkzeug.datastructures import MultiDict
109

1110
QUERY1 = MultiDict([("letters", "a"), ("letters", "b,c"), ("letters", "d,e,f")])
1211
QUERY2 = MultiDict([("letters", "a"), ("letters", "b|c"), ("letters", "d|e|f")])

tests/decorators/test_validation.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
from unittest.mock import MagicMock
22

33
import pytest
4-
from jsonschema import ValidationError
5-
64
from firetail.apis.flask_api import FlaskApi
75
from firetail.decorators.validation import ParameterValidator
86
from firetail.json_schema import Draft4RequestValidator, Draft4ResponseValidator
7+
from jsonschema import ValidationError
98

109

1110
def test_get_valid_parameter():

tests/fakeapi/aiohttp_handlers.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import aiohttp
66
from aiohttp.web import Request
77
from aiohttp.web import Response as AioHttpResponse
8-
98
from firetail.lifecycle import FiretailResponse
109

1110

tests/fakeapi/hello/__init__.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
import datetime
33
import uuid
44

5-
from flask import jsonify, redirect, send_file
6-
75
from firetail import NoContent, ProblemException, context, request
86
from firetail.exceptions import OAuthProblem
7+
from flask import jsonify, redirect, send_file
98

109

1110
class DummyClass:

tests/test_api.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
from unittest.mock import MagicMock
55

66
import pytest
7-
from yaml import YAMLError
8-
97
from firetail import FlaskApi
108
from firetail.exceptions import InvalidSpecification, ResolverError
119
from firetail.spec import canonical_base_path
10+
from yaml import YAMLError
1211

1312
TEST_FOLDER = pathlib.Path(__file__).parent
1413

tests/test_app.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
from flask import Flask
2-
31
from firetail.apis.flask_api import FlaskApi
42
from firetail.apps.flask_app import FlaskApp
3+
from flask import Flask
54

65

76
def test_flask_app_default_params():

tests/test_cli.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import logging
22
from unittest.mock import MagicMock
33

4+
import firetail
45
import pytest
56
from click.testing import CliRunner
67
from conftest import FIXTURES_FOLDER
7-
8-
import firetail
98
from firetail.cli import main
109

1110

tests/test_flask_encoder.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import pytest
77
from conftest import build_app_from_fixture
8-
98
from firetail.apps.flask_app import FlaskJSONEncoder
109

1110
SPECS = ["swagger.yaml", "openapi.yaml"]

tests/test_json_validation.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33

44
import pytest
55
from conftest import build_app_from_fixture
6-
from jsonschema.validators import _utils, extend
7-
86
from firetail import App
97
from firetail.decorators.validation import RequestBodyValidator
108
from firetail.json_schema import Draft4RequestValidator
119
from firetail.spec import Specification
10+
from jsonschema.validators import _utils, extend
1211

1312
SPECS = ["swagger.yaml", "openapi.yaml"]
1413

tests/test_metrics.py

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import flask
44
import pytest
5-
65
from firetail.decorators.metrics import UWSGIMetricsCollector
76
from firetail.exceptions import ProblemException
87

tests/test_operation2.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from unittest import mock
77

88
import pytest
9-
109
from firetail.apis.flask_api import Jsonifier
1110
from firetail.exceptions import InvalidSpecification
1211
from firetail.json_schema import resolve_refs

tests/test_references.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from unittest import mock
22

33
import pytest
4-
54
from firetail.apis.flask_api import Jsonifier
65
from firetail.json_schema import RefResolutionError, resolve_refs
76

tests/test_resolver.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import pytest
2-
31
import firetail.apps
2+
import pytest
43
from firetail.exceptions import ResolverError
54
from firetail.operations import Swagger2Operation
65
from firetail.resolver import RelativeResolver, Resolver, RestyResolver

tests/test_utils.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import math
22
from unittest.mock import MagicMock
33

4-
import pytest
5-
64
import firetail.apps
5+
import pytest
76
from firetail import utils
87

98

tests/test_validation.py

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import flask
44
import pytest
5-
65
from firetail.apis.flask_api import FlaskApi
76
from firetail.decorators.validation import ParameterValidator
87
from firetail.exceptions import BadRequestProblem

0 commit comments

Comments
 (0)