From 9f565f9227731a6641ad63b5dc3c4eff3982308c Mon Sep 17 00:00:00 2001 From: Fabrice Reix Date: Sat, 9 Nov 2024 11:49:28 +0100 Subject: [PATCH] Sort imports with ruff --- bin/check/license.py | 3 +-- bin/check/rust_version.py | 3 ++- bin/coverage_uncovered_lines.py | 1 + bin/docs/build_man_md.py | 8 ++++---- bin/docs/build_readme.py | 2 +- bin/docs/build_standalone_md.py | 4 ++-- bin/docs/markdown.py | 3 +-- bin/release/gen_manpage.py | 2 +- bin/release/get_release_note.test.py | 3 +-- bin/spec/options/format.py | 1 + bin/spec/options/generate_all.py | 13 +++++++------ bin/spec/options/generate_completion.py | 1 + bin/spec/options/generate_man.py | 1 + bin/spec/options/generate_source.py | 5 +++-- contrib/npm/check_publish.py | 6 +++--- integration/hurl/app.py | 3 ++- integration/hurl/integration.py | 4 ++-- integration/hurl/tests_failed/assert_bytearray.py | 3 ++- integration/hurl/tests_failed/assert_match_utf8.py | 3 ++- .../hurl/tests_failed/assert_query_cookie.py | 2 +- integration/hurl/tests_failed/query_invalid_utf8.py | 3 ++- integration/hurl/tests_failed/runner_errors.py | 5 +++-- integration/hurl/tests_failed/streaming.py | 5 +++-- integration/hurl/tests_failed/timeout.py | 3 ++- integration/hurl/tests_ok/assert_header.py | 2 +- integration/hurl/tests_ok/assert_xpath.py | 2 +- integration/hurl/tests_ok/aws_sigv4.py | 5 +++-- integration/hurl/tests_ok/bytes.py | 3 ++- integration/hurl/tests_ok/compressed.py | 3 ++- integration/hurl/tests_ok/content_type.py | 2 +- integration/hurl/tests_ok/cookie_file.py | 2 +- integration/hurl/tests_ok/cookie_jar.py | 2 +- integration/hurl/tests_ok/cookie_storage.py | 2 +- integration/hurl/tests_ok/cookies.py | 2 +- integration/hurl/tests_ok/delay.py | 3 ++- integration/hurl/tests_ok/encoding.py | 5 +++-- integration/hurl/tests_ok/env_var.py | 2 +- integration/hurl/tests_ok/follow_redirect.py | 2 +- integration/hurl/tests_ok/get_large.py | 3 ++- integration/hurl/tests_ok/graphql.py | 2 +- integration/hurl/tests_ok/headers.py | 2 +- integration/hurl/tests_ok/ip.py | 3 ++- integration/hurl/tests_ok/key_template.py | 2 +- integration/hurl/tests_ok/limit_rate.py | 3 ++- integration/hurl/tests_ok/non_utf8.py | 3 ++- integration/hurl/tests_ok/patch.py | 2 +- integration/hurl/tests_ok/path_as_is.py | 2 +- integration/hurl/tests_ok/post_base64.py | 2 +- integration/hurl/tests_ok/post_bytes.py | 2 +- integration/hurl/tests_ok/post_file.py | 2 +- integration/hurl/tests_ok/post_json.py | 2 +- integration/hurl/tests_ok/post_multilines.py | 2 +- integration/hurl/tests_ok/post_xml.py | 2 +- integration/hurl/tests_ok/redirect.py | 2 +- integration/hurl/tests_ok/retry.py | 1 + integration/hurl/tests_ok/retry_until_200.py | 3 ++- integration/hurl/tests_ok/skip.py | 1 - integration/hurl/tests_ok/variables.py | 5 +++-- integration/hurl/tests_ssl/ssl_server.py | 5 +++-- .../hurl/tests_unix_socket/unix_socket_server.py | 3 ++- integration/hurlfmt/integration.py | 2 +- integration/hurlfmt/test_format.py | 2 +- integration/hurlfmt/test_html_output.py | 7 ++++--- integration/hurlfmt/test_lint.py | 2 +- integration/test_pattern.py | 3 ++- integration/test_script.py | 8 ++++---- ruff.toml | 1 + 67 files changed, 115 insertions(+), 88 deletions(-) create mode 100644 ruff.toml diff --git a/bin/check/license.py b/bin/check/license.py index 002255bbc2..55be81ea43 100755 --- a/bin/check/license.py +++ b/bin/check/license.py @@ -7,10 +7,9 @@ Examples: $ python3 bin/check/license.py """ -from typing import List, Tuple - import json import subprocess +from typing import List, Tuple def main(): diff --git a/bin/check/rust_version.py b/bin/check/rust_version.py index c8a96345e4..bade3a984e 100755 --- a/bin/check/rust_version.py +++ b/bin/check/rust_version.py @@ -2,9 +2,10 @@ import datetime import json import os -import requests import sys +import requests + def get_latest_release(): r = requests.get("https://api.github.com/repos/rust-lang/rust/releases") diff --git a/bin/coverage_uncovered_lines.py b/bin/coverage_uncovered_lines.py index 0e70018d92..520395552e 100755 --- a/bin/coverage_uncovered_lines.py +++ b/bin/coverage_uncovered_lines.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import sys + from bs4 import BeautifulSoup COVERAGE_DIR = "target/coverage" diff --git a/bin/docs/build_man_md.py b/bin/docs/build_man_md.py index 5ba1d4f388..678feeebaa 100644 --- a/bin/docs/build_man_md.py +++ b/bin/docs/build_man_md.py @@ -16,13 +16,13 @@ from pathlib import Path from typing import List from markdown import ( - parse_markdown, - MarkdownDoc, Header, - Paragraph, - Whitespace, + MarkdownDoc, Node, + Paragraph, Table, + Whitespace, + parse_markdown, ) diff --git a/bin/docs/build_readme.py b/bin/docs/build_readme.py index 0bc3bf0a52..b48c32c7eb 100755 --- a/bin/docs/build_readme.py +++ b/bin/docs/build_readme.py @@ -20,7 +20,7 @@ import re import sys from pathlib import Path -from markdown import parse_markdown, MarkdownDoc +from markdown import MarkdownDoc, parse_markdown def build_home_md(text: str) -> MarkdownDoc: diff --git a/bin/docs/build_standalone_md.py b/bin/docs/build_standalone_md.py index b122142275..7fc5777b39 100644 --- a/bin/docs/build_standalone_md.py +++ b/bin/docs/build_standalone_md.py @@ -13,10 +13,10 @@ import os import re import sys import unicodedata +from pathlib import Path import markdown -from markdown import MarkdownDoc, Paragraph, RefLink, Header, Whitespace, Table -from pathlib import Path +from markdown import Header, MarkdownDoc, Paragraph, RefLink, Table, Whitespace def add_section_header(doc: MarkdownDoc, title: str): diff --git a/bin/docs/markdown.py b/bin/docs/markdown.py index 63a95b1623..7d7810659f 100644 --- a/bin/docs/markdown.py +++ b/bin/docs/markdown.py @@ -9,11 +9,10 @@ This module allows to manipulate Markdown document: import re import unicodedata +from parser import Parser from textwrap import dedent from typing import List, Optional -from parser import Parser - class Node: """Represent the base class for a Markdown document token.""" diff --git a/bin/release/gen_manpage.py b/bin/release/gen_manpage.py index c95983852e..cba6830380 100755 --- a/bin/release/gen_manpage.py +++ b/bin/release/gen_manpage.py @@ -11,8 +11,8 @@ Examples: """ -import sys import re +import sys from datetime import date from typing import Optional diff --git a/bin/release/get_release_note.test.py b/bin/release/get_release_note.test.py index f9ac36d98c..2b659594a1 100755 --- a/bin/release/get_release_note.test.py +++ b/bin/release/get_release_note.test.py @@ -3,15 +3,14 @@ import datetime import unittest from get_release_note import ( - Pull, Issue, + Pull, authors_from_issues, generate_md, pulls_from_issues, webscrapping_linked_pulls, ) - ISSUES = [ Issue(number=1, tags=["enhancement"], author="bob", pulls=[Pull("url1", "pull1")]), Issue( diff --git a/bin/spec/options/format.py b/bin/spec/options/format.py index 1600423600..6010dde68c 100755 --- a/bin/spec/options/format.py +++ b/bin/spec/options/format.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import sys + from option import Option """ diff --git a/bin/spec/options/generate_all.py b/bin/spec/options/generate_all.py index 4af09560a5..3d61ae4e14 100755 --- a/bin/spec/options/generate_all.py +++ b/bin/spec/options/generate_all.py @@ -1,12 +1,13 @@ #!/usr/bin/env python3 -from typing import List import glob -from option import Option -import generate_source -import generate_man -import generate_completion -import sys import re +import sys +from typing import List + +import generate_completion +import generate_man +import generate_source +from option import Option def get_option_files(dir) -> List[str]: diff --git a/bin/spec/options/generate_completion.py b/bin/spec/options/generate_completion.py index c89b5d9dc5..1b7c2d5307 100755 --- a/bin/spec/options/generate_completion.py +++ b/bin/spec/options/generate_completion.py @@ -4,6 +4,7 @@ Generate Completion files """ from typing import List + from option import Option diff --git a/bin/spec/options/generate_man.py b/bin/spec/options/generate_man.py index 5182451a92..fee291e0f6 100755 --- a/bin/spec/options/generate_man.py +++ b/bin/spec/options/generate_man.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import sys + from option import Option """ diff --git a/bin/spec/options/generate_source.py b/bin/spec/options/generate_source.py index 1e1bbd5376..cd6ed5b98f 100755 --- a/bin/spec/options/generate_source.py +++ b/bin/spec/options/generate_source.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 -import sys -from option import Option import os +import sys + +from option import Option """ Generate source file for clap diff --git a/contrib/npm/check_publish.py b/contrib/npm/check_publish.py index d857a14377..94e4642174 100644 --- a/contrib/npm/check_publish.py +++ b/contrib/npm/check_publish.py @@ -4,10 +4,10 @@ Examples: $ python3 contrib/npm/check_archive.py 1.6.1 """ -import sys -import json -from pathlib import Path import hashlib +import json +import sys +from pathlib import Path from urllib import request diff --git a/integration/hurl/app.py b/integration/hurl/app.py index 477befa157..8b2e4999d0 100644 --- a/integration/hurl/app.py +++ b/integration/hurl/app.py @@ -1,8 +1,9 @@ -from flask import Flask import glob import importlib import os +from flask import Flask + app = Flask(__name__) diff --git a/integration/hurl/integration.py b/integration/hurl/integration.py index 593a6105f2..cb09cb465f 100755 --- a/integration/hurl/integration.py +++ b/integration/hurl/integration.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -import sys import glob -import re import platform +import re +import sys sys.path.append("..") import test_script diff --git a/integration/hurl/tests_failed/assert_bytearray.py b/integration/hurl/tests_failed/assert_bytearray.py index b2045e13a2..4a200a5c18 100644 --- a/integration/hurl/tests_failed/assert_bytearray.py +++ b/integration/hurl/tests_failed/assert_bytearray.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response -from io import BytesIO @app.route("/error-assert-bytearray") diff --git a/integration/hurl/tests_failed/assert_match_utf8.py b/integration/hurl/tests_failed/assert_match_utf8.py index dd333fb30f..3fbd209cf8 100644 --- a/integration/hurl/tests_failed/assert_match_utf8.py +++ b/integration/hurl/tests_failed/assert_match_utf8.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response -from io import BytesIO @app.route("/error-assert/match-utf8") diff --git a/integration/hurl/tests_failed/assert_query_cookie.py b/integration/hurl/tests_failed/assert_query_cookie.py index ea12c192e6..826a6dad48 100644 --- a/integration/hurl/tests_failed/assert_query_cookie.py +++ b/integration/hurl/tests_failed/assert_query_cookie.py @@ -1,5 +1,5 @@ -from flask import make_response from app import app +from flask import make_response @app.route("/error-assert-query-cookie") diff --git a/integration/hurl/tests_failed/query_invalid_utf8.py b/integration/hurl/tests_failed/query_invalid_utf8.py index 1c420f9990..edff24e752 100644 --- a/integration/hurl/tests_failed/query_invalid_utf8.py +++ b/integration/hurl/tests_failed/query_invalid_utf8.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response -from io import BytesIO @app.route("/error-query-invalid-utf8") diff --git a/integration/hurl/tests_failed/runner_errors.py b/integration/hurl/tests_failed/runner_errors.py index 693fa5674e..d2467eaf8e 100644 --- a/integration/hurl/tests_failed/runner_errors.py +++ b/integration/hurl/tests_failed/runner_errors.py @@ -1,7 +1,8 @@ -from app import app -from flask import make_response, Response, redirect from io import BytesIO +from app import app +from flask import Response, make_response, redirect + @app.route("/runner_errors") def runner_errors(): diff --git a/integration/hurl/tests_failed/streaming.py b/integration/hurl/tests_failed/streaming.py index 1251fceac8..427290d1a9 100644 --- a/integration/hurl/tests_failed/streaming.py +++ b/integration/hurl/tests_failed/streaming.py @@ -1,8 +1,9 @@ # coding=utf-8 +import itertools +import time + from app import app from flask import Response -import time -import itertools @app.route("/streaming") diff --git a/integration/hurl/tests_failed/timeout.py b/integration/hurl/tests_failed/timeout.py index 320cdb62c8..419629dc61 100644 --- a/integration/hurl/tests_failed/timeout.py +++ b/integration/hurl/tests_failed/timeout.py @@ -1,6 +1,7 @@ -from app import app import time +from app import app + @app.route("/timeout") def timeout(): diff --git a/integration/hurl/tests_ok/assert_header.py b/integration/hurl/tests_ok/assert_header.py index d54eac5afb..c675d0a09d 100644 --- a/integration/hurl/tests_ok/assert_header.py +++ b/integration/hurl/tests_ok/assert_header.py @@ -1,5 +1,5 @@ from app import app -from flask import redirect, Response +from flask import Response, redirect @app.route("/assert-header") diff --git a/integration/hurl/tests_ok/assert_xpath.py b/integration/hurl/tests_ok/assert_xpath.py index 41e4704bc5..feb7bed7dc 100644 --- a/integration/hurl/tests_ok/assert_xpath.py +++ b/integration/hurl/tests_ok/assert_xpath.py @@ -1,6 +1,6 @@ # coding=utf-8 -from flask import Response from app import app +from flask import Response @app.route("/assert-xpath") diff --git a/integration/hurl/tests_ok/aws_sigv4.py b/integration/hurl/tests_ok/aws_sigv4.py index 4c9bf97620..12a594bd88 100644 --- a/integration/hurl/tests_ok/aws_sigv4.py +++ b/integration/hurl/tests_ok/aws_sigv4.py @@ -1,7 +1,8 @@ -from flask import request -from app import app import re +from app import app +from flask import request + @app.route("/aws-sigv4", methods=["POST"]) def aws_sigv4(): diff --git a/integration/hurl/tests_ok/bytes.py b/integration/hurl/tests_ok/bytes.py index 79122e3ff0..d5504388c2 100644 --- a/integration/hurl/tests_ok/bytes.py +++ b/integration/hurl/tests_ok/bytes.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response -from io import BytesIO @app.route("/bytes") diff --git a/integration/hurl/tests_ok/compressed.py b/integration/hurl/tests_ok/compressed.py index 84fedcbb7d..24e8735f7e 100644 --- a/integration/hurl/tests_ok/compressed.py +++ b/integration/hurl/tests_ok/compressed.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response, request -from io import BytesIO @app.route("/compressed/gzip") diff --git a/integration/hurl/tests_ok/content_type.py b/integration/hurl/tests_ok/content_type.py index 16713a3142..9cf540a6e5 100644 --- a/integration/hurl/tests_ok/content_type.py +++ b/integration/hurl/tests_ok/content_type.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/content-type-json", methods=["POST"]) diff --git a/integration/hurl/tests_ok/cookie_file.py b/integration/hurl/tests_ok/cookie_file.py index c5876c200c..a1df37bb5f 100644 --- a/integration/hurl/tests_ok/cookie_file.py +++ b/integration/hurl/tests_ok/cookie_file.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/cookie_file") diff --git a/integration/hurl/tests_ok/cookie_jar.py b/integration/hurl/tests_ok/cookie_jar.py index ff7557d7fe..cc6da8ef67 100644 --- a/integration/hurl/tests_ok/cookie_jar.py +++ b/integration/hurl/tests_ok/cookie_jar.py @@ -1,5 +1,5 @@ -from flask import make_response from app import app +from flask import make_response @app.route("/cookie-jar") diff --git a/integration/hurl/tests_ok/cookie_storage.py b/integration/hurl/tests_ok/cookie_storage.py index e5d6d3693d..e05006fa05 100644 --- a/integration/hurl/tests_ok/cookie_storage.py +++ b/integration/hurl/tests_ok/cookie_storage.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/cookie-storage/assert-that-cookie1-is-valueA") diff --git a/integration/hurl/tests_ok/cookies.py b/integration/hurl/tests_ok/cookies.py index 9c10466e2d..d767f0c853 100644 --- a/integration/hurl/tests_ok/cookies.py +++ b/integration/hurl/tests_ok/cookies.py @@ -1,5 +1,5 @@ -from flask import request, make_response, Response from app import app +from flask import Response, make_response, request @app.route("/cookies/set-request-cookie1-valueA") diff --git a/integration/hurl/tests_ok/delay.py b/integration/hurl/tests_ok/delay.py index 3706bb4c3a..0608fa13c6 100644 --- a/integration/hurl/tests_ok/delay.py +++ b/integration/hurl/tests_ok/delay.py @@ -1,6 +1,7 @@ -from app import app from datetime import datetime +from app import app + last = None counter = 0 diff --git a/integration/hurl/tests_ok/encoding.py b/integration/hurl/tests_ok/encoding.py index d719e22278..8e12228ec4 100644 --- a/integration/hurl/tests_ok/encoding.py +++ b/integration/hurl/tests_ok/encoding.py @@ -1,7 +1,8 @@ -from flask import make_response -from app import app from io import BytesIO +from app import app +from flask import make_response + @app.route("/encoding/utf8") def encoding_utf8(): diff --git a/integration/hurl/tests_ok/env_var.py b/integration/hurl/tests_ok/env_var.py index e176a73f53..03e3f8f652 100644 --- a/integration/hurl/tests_ok/env_var.py +++ b/integration/hurl/tests_ok/env_var.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/env-var") diff --git a/integration/hurl/tests_ok/follow_redirect.py b/integration/hurl/tests_ok/follow_redirect.py index e035cc66bf..4ae6f44147 100644 --- a/integration/hurl/tests_ok/follow_redirect.py +++ b/integration/hurl/tests_ok/follow_redirect.py @@ -1,5 +1,5 @@ from app import app -from flask import request, redirect, Response +from flask import Response, redirect, request @app.route("/follow-redirect", methods=["GET", "POST"]) diff --git a/integration/hurl/tests_ok/get_large.py b/integration/hurl/tests_ok/get_large.py index 80be986e57..48ed0b1e84 100644 --- a/integration/hurl/tests_ok/get_large.py +++ b/integration/hurl/tests_ok/get_large.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response -from io import BytesIO @app.route("/get_large") diff --git a/integration/hurl/tests_ok/graphql.py b/integration/hurl/tests_ok/graphql.py index 18e192ced1..91956d029b 100644 --- a/integration/hurl/tests_ok/graphql.py +++ b/integration/hurl/tests_ok/graphql.py @@ -1,5 +1,5 @@ from app import app -from flask import request, make_response +from flask import make_response, request @app.route("/graphql", methods=["POST"]) diff --git a/integration/hurl/tests_ok/headers.py b/integration/hurl/tests_ok/headers.py index dbedfe5055..e87baacff3 100644 --- a/integration/hurl/tests_ok/headers.py +++ b/integration/hurl/tests_ok/headers.py @@ -1,6 +1,6 @@ # coding=utf-8 -from flask import request, make_response from app import app +from flask import make_response, request @app.route("/default-headers") diff --git a/integration/hurl/tests_ok/ip.py b/integration/hurl/tests_ok/ip.py index 1555390abf..3f626ed16a 100644 --- a/integration/hurl/tests_ok/ip.py +++ b/integration/hurl/tests_ok/ip.py @@ -1,5 +1,6 @@ +from ipaddress import IPv4Address, IPv6Address, ip_address + from app import app -from ipaddress import ip_address, IPv4Address, IPv6Address from flask import Response, request diff --git a/integration/hurl/tests_ok/key_template.py b/integration/hurl/tests_ok/key_template.py index 221987791c..063e340906 100644 --- a/integration/hurl/tests_ok/key_template.py +++ b/integration/hurl/tests_ok/key_template.py @@ -1,6 +1,6 @@ # coding=utf-8 -from flask import request from app import app +from flask import request @app.route("/key-template/header") diff --git a/integration/hurl/tests_ok/limit_rate.py b/integration/hurl/tests_ok/limit_rate.py index 319481ab99..34e6474a6c 100644 --- a/integration/hurl/tests_ok/limit_rate.py +++ b/integration/hurl/tests_ok/limit_rate.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response -from io import BytesIO @app.route("/dummy_bytes") diff --git a/integration/hurl/tests_ok/non_utf8.py b/integration/hurl/tests_ok/non_utf8.py index b6dbc1805b..1d7d6e0d8b 100644 --- a/integration/hurl/tests_ok/non_utf8.py +++ b/integration/hurl/tests_ok/non_utf8.py @@ -1,6 +1,7 @@ +from io import BytesIO + from app import app from flask import make_response -from io import BytesIO @app.route("/non-utf8") diff --git a/integration/hurl/tests_ok/patch.py b/integration/hurl/tests_ok/patch.py index 53b485b0a2..02d49ec776 100644 --- a/integration/hurl/tests_ok/patch.py +++ b/integration/hurl/tests_ok/patch.py @@ -1,5 +1,5 @@ -from flask import request, make_response from app import app +from flask import make_response, request @app.route("/patch/file.txt", methods=["PATCH"]) diff --git a/integration/hurl/tests_ok/path_as_is.py b/integration/hurl/tests_ok/path_as_is.py index 520644cb73..43a5cd8a02 100644 --- a/integration/hurl/tests_ok/path_as_is.py +++ b/integration/hurl/tests_ok/path_as_is.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/path-as-is/../resource") diff --git a/integration/hurl/tests_ok/post_base64.py b/integration/hurl/tests_ok/post_base64.py index 31a0a96ab5..d6ed03d243 100644 --- a/integration/hurl/tests_ok/post_base64.py +++ b/integration/hurl/tests_ok/post_base64.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/post-base64", methods=["POST"]) diff --git a/integration/hurl/tests_ok/post_bytes.py b/integration/hurl/tests_ok/post_bytes.py index 2b87f7d522..8ad92bccb2 100644 --- a/integration/hurl/tests_ok/post_bytes.py +++ b/integration/hurl/tests_ok/post_bytes.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/post-bytes", methods=["POST"]) diff --git a/integration/hurl/tests_ok/post_file.py b/integration/hurl/tests_ok/post_file.py index d8860c0e8d..4c199cf86e 100644 --- a/integration/hurl/tests_ok/post_file.py +++ b/integration/hurl/tests_ok/post_file.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/post-file", methods=["POST"]) diff --git a/integration/hurl/tests_ok/post_json.py b/integration/hurl/tests_ok/post_json.py index fad3ea1972..551c53acf8 100644 --- a/integration/hurl/tests_ok/post_json.py +++ b/integration/hurl/tests_ok/post_json.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/post-json", methods=["POST"]) diff --git a/integration/hurl/tests_ok/post_multilines.py b/integration/hurl/tests_ok/post_multilines.py index 012f4709af..d97a15a8bd 100644 --- a/integration/hurl/tests_ok/post_multilines.py +++ b/integration/hurl/tests_ok/post_multilines.py @@ -1,5 +1,5 @@ -from flask import request from app import app +from flask import request @app.route("/post-multilines", methods=["POST"]) diff --git a/integration/hurl/tests_ok/post_xml.py b/integration/hurl/tests_ok/post_xml.py index fcae14d083..902119e2b5 100644 --- a/integration/hurl/tests_ok/post_xml.py +++ b/integration/hurl/tests_ok/post_xml.py @@ -1,6 +1,6 @@ # coding=utf-8 -from flask import request from app import app +from flask import request @app.route("/post-xml", methods=["POST"]) diff --git a/integration/hurl/tests_ok/redirect.py b/integration/hurl/tests_ok/redirect.py index 89c7d0b106..351aa7f410 100644 --- a/integration/hurl/tests_ok/redirect.py +++ b/integration/hurl/tests_ok/redirect.py @@ -1,5 +1,5 @@ from app import app -from flask import redirect, Response +from flask import Response, redirect @app.route("/redirect-absolute") diff --git a/integration/hurl/tests_ok/retry.py b/integration/hurl/tests_ok/retry.py index 507f215dfb..5e83bfdab0 100644 --- a/integration/hurl/tests_ok/retry.py +++ b/integration/hurl/tests_ok/retry.py @@ -1,5 +1,6 @@ import uuid from http import HTTPStatus + from app import app from flask import Response diff --git a/integration/hurl/tests_ok/retry_until_200.py b/integration/hurl/tests_ok/retry_until_200.py index 9835de6aa1..006dea112b 100644 --- a/integration/hurl/tests_ok/retry_until_200.py +++ b/integration/hurl/tests_ok/retry_until_200.py @@ -1,8 +1,9 @@ # return 500 by default # or 200 if previous request has been executed less than 5 second ago -from app import app import time +from app import app + last = 0 diff --git a/integration/hurl/tests_ok/skip.py b/integration/hurl/tests_ok/skip.py index 62e739ce88..1656079548 100644 --- a/integration/hurl/tests_ok/skip.py +++ b/integration/hurl/tests_ok/skip.py @@ -1,7 +1,6 @@ # coding=utf-8 from app import app - counter = 0 diff --git a/integration/hurl/tests_ok/variables.py b/integration/hurl/tests_ok/variables.py index 494325a2bd..71ba3b1afd 100644 --- a/integration/hurl/tests_ok/variables.py +++ b/integration/hurl/tests_ok/variables.py @@ -1,7 +1,8 @@ -from flask import request -from app import app import json +from app import app +from flask import request + @app.route("/variables", methods=["POST"]) def variables(): diff --git a/integration/hurl/tests_ssl/ssl_server.py b/integration/hurl/tests_ssl/ssl_server.py index 820dc64992..449d689090 100755 --- a/integration/hurl/tests_ssl/ssl_server.py +++ b/integration/hurl/tests_ssl/ssl_server.py @@ -1,9 +1,10 @@ #!/usr/bin/env python # usage: ./ssl_server.py # Start the server with or without client certificate authentication -import flask -import sys import ssl +import sys + +import flask app1 = flask.Flask("SSL Server") diff --git a/integration/hurl/tests_unix_socket/unix_socket_server.py b/integration/hurl/tests_unix_socket/unix_socket_server.py index 2f89c7509b..a9d8d8cdf5 100644 --- a/integration/hurl/tests_unix_socket/unix_socket_server.py +++ b/integration/hurl/tests_unix_socket/unix_socket_server.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from os import path, unlink -from socket import socket, AF_UNIX +from socket import AF_UNIX, socket + from flask import Flask app = Flask("Unix Domain Sockets Server") diff --git a/integration/hurlfmt/integration.py b/integration/hurlfmt/integration.py index 647d7227ae..f9e53bdada 100755 --- a/integration/hurlfmt/integration.py +++ b/integration/hurlfmt/integration.py @@ -5,8 +5,8 @@ import re import sys sys.path.append("..") -import test_lint import test_format +import test_lint import test_script diff --git a/integration/hurlfmt/test_format.py b/integration/hurlfmt/test_format.py index 18c23f4337..29ce09f21a 100755 --- a/integration/hurlfmt/test_format.py +++ b/integration/hurlfmt/test_format.py @@ -4,8 +4,8 @@ # import codecs import os -import sys import subprocess +import sys def decode_string(encoded): diff --git a/integration/hurlfmt/test_html_output.py b/integration/hurlfmt/test_html_output.py index 0cbe3c33cf..0e2f05160a 100755 --- a/integration/hurlfmt/test_html_output.py +++ b/integration/hurlfmt/test_html_output.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 # Extract hurl file from html output -import sys -from bs4 import BeautifulSoup -import os import codecs +import os +import sys + +from bs4 import BeautifulSoup def test(html_file): diff --git a/integration/hurlfmt/test_lint.py b/integration/hurlfmt/test_lint.py index fbb2c1297c..53b8a50239 100755 --- a/integration/hurlfmt/test_lint.py +++ b/integration/hurlfmt/test_lint.py @@ -2,8 +2,8 @@ # lint hurl file # import codecs -import sys import subprocess +import sys def decode_string(encoded): diff --git a/integration/test_pattern.py b/integration/test_pattern.py index 2f7e7d756f..2c73f80094 100755 --- a/integration/test_pattern.py +++ b/integration/test_pattern.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import unittest -from test_script import parse_pattern, escape_regex_metacharacters + +from test_script import escape_regex_metacharacters, parse_pattern class PatternTest(unittest.TestCase): diff --git a/integration/test_script.py b/integration/test_script.py index 0f1c74b6e3..ecff3426e2 100755 --- a/integration/test_script.py +++ b/integration/test_script.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 # Test script file. # -import codecs -import sys -import subprocess -import os import argparse +import codecs +import os import re +import subprocess +import sys def decode_string(encoded: bytes) -> str: diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000000..6274556e74 --- /dev/null +++ b/ruff.toml @@ -0,0 +1 @@ +lint.extend-select = ["I"]