From a8302fc4b5cd23353fd942fa759e563d4d15d521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A8=D0=BF=D0=B0=D0=BA=20=D0=90=D0=BD=D0=B4=D1=80=D0=B5?= =?UTF-8?q?=D0=B9=20=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?= Date: Sun, 19 Jan 2025 09:36:12 +0300 Subject: [PATCH] Code quality: Fix unused imports and switch on related ruff check --- examples/custom_shape/wait_user_count.py | 1 - examples/dispatch_test_scripts/locustfile.py | 2 -- examples/events.py | 2 +- examples/extend_web_ui.py | 4 ++-- examples/manual_stats_reporting.py | 2 +- examples/mongodb/locustfile.py | 2 +- examples/postgres/locustfile.py | 2 +- examples/terraform/aws/plan/basic.py | 2 -- examples/web_ui_cache_stats.py | 4 ++-- locust/__init__.py | 5 ++++- locust/argument_parser.py | 1 - locust/contrib/fasthttp.py | 2 +- locust/html.py | 3 --- locust/main.py | 5 ++--- locust/rpc/__init__.py | 5 +++++ locust/test/test_fasthttp.py | 1 - locust/test/test_load_locustfile.py | 1 - locust/test/test_main.py | 2 +- locust/test/test_parser.py | 1 - locust/test/test_sequential_taskset.py | 2 +- locust/test/test_wait_time.py | 1 - locust/test/test_web.py | 7 +------ locust/test/test_zmqrpc.py | 2 +- locust/user/__init__.py | 7 +++++++ locust/web.py | 1 - pyproject.toml | 2 +- 26 files changed, 32 insertions(+), 37 deletions(-) diff --git a/examples/custom_shape/wait_user_count.py b/examples/custom_shape/wait_user_count.py index 4428efb719..bd4d1f2989 100644 --- a/examples/custom_shape/wait_user_count.py +++ b/examples/custom_shape/wait_user_count.py @@ -1,6 +1,5 @@ from locust import HttpUser, LoadTestShape, TaskSet, constant, task -import math import random import time from collections import namedtuple diff --git a/examples/dispatch_test_scripts/locustfile.py b/examples/dispatch_test_scripts/locustfile.py index 7bdff4e456..8c3698c266 100644 --- a/examples/dispatch_test_scripts/locustfile.py +++ b/examples/dispatch_test_scripts/locustfile.py @@ -1,7 +1,5 @@ from locust import HttpUser, LoadTestShape, constant, task -import math - class UserA(HttpUser): wait_time = constant(600) diff --git a/examples/events.py b/examples/events.py index 1674e31b68..cca605e543 100644 --- a/examples/events.py +++ b/examples/events.py @@ -3,7 +3,7 @@ track the sum of the content-length header in all successful HTTP responses """ -from locust import HttpUser, TaskSet, between, events, task, web +from locust import HttpUser, TaskSet, between, events, task class MyTaskSet(TaskSet): diff --git a/examples/extend_web_ui.py b/examples/extend_web_ui.py index aac66c17e9..9a60bfd3ae 100644 --- a/examples/extend_web_ui.py +++ b/examples/extend_web_ui.py @@ -4,14 +4,14 @@ successful HTTP responses and display them in the web UI. """ -from locust import HttpUser, TaskSet, between, events, task, web +from locust import HttpUser, TaskSet, between, events, task import json import os from html import escape from time import time -from flask import Blueprint, jsonify, make_response, render_template, request +from flask import Blueprint, make_response, render_template, request class MyTaskSet(TaskSet): diff --git a/examples/manual_stats_reporting.py b/examples/manual_stats_reporting.py index cb4bc8daf3..9444807294 100644 --- a/examples/manual_stats_reporting.py +++ b/examples/manual_stats_reporting.py @@ -20,7 +20,7 @@ def my_task(self): from locust import User, constant, events, task import random -from contextlib import ContextDecorator, contextmanager +from contextlib import contextmanager from time import sleep, time diff --git a/examples/mongodb/locustfile.py b/examples/mongodb/locustfile.py index 04fa910b32..ebd3f96e16 100644 --- a/examples/mongodb/locustfile.py +++ b/examples/mongodb/locustfile.py @@ -1,4 +1,4 @@ -from locust import between, task +from locust import task from locust.contrib.mongodb import MongoDBUser import os diff --git a/examples/postgres/locustfile.py b/examples/postgres/locustfile.py index fca4f9eee9..341db4bdf1 100644 --- a/examples/postgres/locustfile.py +++ b/examples/postgres/locustfile.py @@ -1,4 +1,4 @@ -from locust import TaskSet, between, task +from locust import task from locust.contrib.postgres import PostgresUser import os diff --git a/examples/terraform/aws/plan/basic.py b/examples/terraform/aws/plan/basic.py index efc5265b18..fbda52aee4 100644 --- a/examples/terraform/aws/plan/basic.py +++ b/examples/terraform/aws/plan/basic.py @@ -1,7 +1,5 @@ from locust import HttpUser, between, task -import time - class Quickstart(HttpUser): wait_time = between(1, 5) diff --git a/examples/web_ui_cache_stats.py b/examples/web_ui_cache_stats.py index d8005b86f3..9ab2ca4f55 100644 --- a/examples/web_ui_cache_stats.py +++ b/examples/web_ui_cache_stats.py @@ -4,14 +4,14 @@ and display them in the web UI. """ -from locust import HttpUser, TaskSet, between, events, task, web +from locust import HttpUser, TaskSet, between, events, task import json import os from html import escape from time import time -from flask import Blueprint, jsonify, make_response, render_template, request +from flask import Blueprint, make_response, render_template, request class MyTaskSet(TaskSet): diff --git a/locust/__init__.py b/locust/__init__.py index b5c69c81e1..7dcdac4c34 100644 --- a/locust/__init__.py +++ b/locust/__init__.py @@ -5,7 +5,7 @@ print("Uninstall trio package and remove the setting.") try: # preserve backwards compatibility for now - import trio + import trio # noqa: F401 except ModuleNotFoundError: # dont show a massive callstack if trio is not installed os._exit(1) @@ -50,6 +50,9 @@ "events", "LoadTestShape", "run_single_user", + "HttpLocust", + "Locust", + "__version__", ) # Used for raising a DeprecationWarning if old Locust/HttpLocust is used diff --git a/locust/argument_parser.py b/locust/argument_parser.py index 9334b8e8be..e1fc4bd9fe 100644 --- a/locust/argument_parser.py +++ b/locust/argument_parser.py @@ -10,7 +10,6 @@ import os import platform import socket -import ssl import sys import tempfile import textwrap diff --git a/locust/contrib/fasthttp.py b/locust/contrib/fasthttp.py index 9c0f7a9a31..0caeeeab0c 100644 --- a/locust/contrib/fasthttp.py +++ b/locust/contrib/fasthttp.py @@ -3,7 +3,7 @@ from locust.env import Environment from locust.exception import CatchResponseError, LocustError, ResponseError from locust.user import User -from locust.util.deprecation import DeprecatedFastHttpLocustClass as FastHttpLocust +from locust.util.deprecation import DeprecatedFastHttpLocustClass as FastHttpLocust # noqa: F401 import json import json as unshadowed_json # some methods take a named parameter called json diff --git a/locust/html.py b/locust/html.py index 7aa2fb062f..e813483cf7 100644 --- a/locust/html.py +++ b/locust/html.py @@ -1,9 +1,6 @@ -import glob import os -import pathlib from html import escape from itertools import chain -from json import dumps from jinja2 import Environment as JinjaEnvironment from jinja2 import FileSystemLoader diff --git a/locust/main.py b/locust/main.py index 2e4fe5deaf..217a89bd19 100644 --- a/locust/main.py +++ b/locust/main.py @@ -8,7 +8,6 @@ import importlib.metadata import inspect import itertools -import json import logging import os import signal @@ -39,12 +38,12 @@ # import external plugins if installed to allow for registering custom arguments etc try: - import locust_plugins # pyright: ignore[reportMissingImports] + import locust_plugins # pyright: ignore[reportMissingImports] # noqa: F401 except ModuleNotFoundError as e: if e.msg != "No module named 'locust_plugins'": raise try: - import locust_cloud # pyright: ignore[reportMissingImports] + import locust_cloud # pyright: ignore[reportMissingImports] # noqa: F401 locust_cloud_version = f" (locust-cloud {importlib.metadata.version('locust-cloud')})" except ModuleNotFoundError as e: diff --git a/locust/rpc/__init__.py b/locust/rpc/__init__.py index 8cb4d54230..733d9a5938 100644 --- a/locust/rpc/__init__.py +++ b/locust/rpc/__init__.py @@ -1,2 +1,7 @@ +__all__ = ( + "Message", + "rpc", +) + from . import zmqrpc as rpc from .protocol import Message diff --git a/locust/test/test_fasthttp.py b/locust/test/test_fasthttp.py index b14d293829..ee74613001 100644 --- a/locust/test/test_fasthttp.py +++ b/locust/test/test_fasthttp.py @@ -1,5 +1,4 @@ from locust import FastHttpUser -from locust.argument_parser import parse_options from locust.contrib.fasthttp import FastHttpSession from locust.exception import CatchResponseError, InterruptTaskSet, LocustError, ResponseError from locust.user import TaskSet, task diff --git a/locust/test/test_load_locustfile.py b/locust/test/test_load_locustfile.py index d3058deeb4..cb0ace4f05 100644 --- a/locust/test/test_load_locustfile.py +++ b/locust/test/test_load_locustfile.py @@ -6,7 +6,6 @@ import filecmp import os -import pathlib import textwrap from .mock_locustfile import MOCK_LOCUSTFILE_CONTENT, mock_locustfile diff --git a/locust/test/test_main.py b/locust/test/test_main.py index 29ff2ab424..30dfa04cf5 100644 --- a/locust/test/test_main.py +++ b/locust/test/test_main.py @@ -9,7 +9,7 @@ import sys import textwrap import unittest -from subprocess import DEVNULL, PIPE, STDOUT +from subprocess import PIPE, STDOUT from tempfile import TemporaryDirectory from unittest import TestCase diff --git a/locust/test/test_parser.py b/locust/test/test_parser.py index 7bdda809da..48473c9705 100644 --- a/locust/test/test_parser.py +++ b/locust/test/test_parser.py @@ -10,7 +10,6 @@ import os import unittest from io import StringIO -from random import randint from tempfile import NamedTemporaryFile, TemporaryDirectory from unittest import mock diff --git a/locust/test/test_sequential_taskset.py b/locust/test/test_sequential_taskset.py index c8c6440f66..fceedc99b3 100644 --- a/locust/test/test_sequential_taskset.py +++ b/locust/test/test_sequential_taskset.py @@ -1,4 +1,4 @@ -from locust import User, constant, task +from locust import User, task from locust.exception import RescheduleTask from locust.user.sequential_taskset import SequentialTaskSet diff --git a/locust/test/test_wait_time.py b/locust/test/test_wait_time.py index 62319edac9..01aab947ab 100644 --- a/locust/test/test_wait_time.py +++ b/locust/test/test_wait_time.py @@ -1,5 +1,4 @@ from locust import TaskSet, User, between, constant, constant_throughput -from locust.exception import MissingWaitTimeError import random import time diff --git a/locust/test/test_web.py b/locust/test/test_web.py index 67b1be3fed..70487f8a62 100644 --- a/locust/test/test_web.py +++ b/locust/test/test_web.py @@ -10,24 +10,19 @@ from locust.user import User, task from locust.web import WebUI -import copy import csv import json import logging import os -import re -import textwrap import traceback from io import StringIO -from tempfile import NamedTemporaryFile, TemporaryDirectory +from tempfile import NamedTemporaryFile import gevent import requests from flask_login import UserMixin from pyquery import PyQuery as pq -from ..util.load_locustfile import load_locustfile -from .mock_locustfile import mock_locustfile from .testcases import LocustTestCase from .util import create_tls_cert diff --git a/locust/test/test_zmqrpc.py b/locust/test/test_zmqrpc.py index 30f4cb4aaf..2d548b909d 100644 --- a/locust/test/test_zmqrpc.py +++ b/locust/test/test_zmqrpc.py @@ -1,4 +1,4 @@ -from locust.exception import RPCError, RPCReceiveError, RPCSendError +from locust.exception import RPCError, RPCSendError from locust.rpc import Message, zmqrpc from locust.test.testcases import LocustTestCase diff --git a/locust/user/__init__.py b/locust/user/__init__.py index 80cfae82ae..226ae7d57c 100644 --- a/locust/user/__init__.py +++ b/locust/user/__init__.py @@ -1,2 +1,9 @@ +__all__ = ( + "HttpUser", + "tag", + "task", + "TaskSet", + "User", +) from .task import TaskSet, tag, task from .users import HttpUser, User diff --git a/locust/web.py b/locust/web.py index 90c41fcde2..0bca915ff1 100644 --- a/locust/web.py +++ b/locust/web.py @@ -10,7 +10,6 @@ from io import StringIO from itertools import chain from json import dumps -from time import time from typing import TYPE_CHECKING, Any, TypedDict import gevent diff --git a/pyproject.toml b/pyproject.toml index 44817c73b2..4919ea9f7e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -193,7 +193,7 @@ extend-exclude = [ "examples/issue_*.py", "src/readthedocs-sphinx-search/", ] -lint.ignore = ["E402", "E501", "E713", "E731", "E741", "F401"] +lint.ignore = ["E402", "E501", "E713", "E731", "E741"] lint.select = ["E", "F", "W", "UP", "FA102", "I001"] [tool.ruff.lint.per-file-ignores]