locust 2.46.7.dev2__tar.gz → 2.46.7.dev7__tar.gz

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: locust
-Version: 2.46.7.dev2
+Version: 2.46.7.dev7
 Summary: Developer-friendly load testing framework
 Project-URL: Homepage, https://locust.cloud/
 Project-URL: Repository, https://github.com/locustio/locust
@@ -83,11 +83,12 @@ If you want your users to loop, perform some conditional behaviour or do some ca
 ```python
 from locust import HttpUser, task, between
 
+
 class QuickstartUser(HttpUser):
     wait_time = between(1, 2)
 
     def on_start(self):
-        self.client.post("/login", json={"username":"foo", "password":"bar"})
+        self.client.post("/login", json={"username": "foo", "password": "bar"})
 
     @task
     def hello_world(self):

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/README.md

@@ -24,11 +24,12 @@ If you want your users to loop, perform some conditional behaviour or do some ca
 ```python
 from locust import HttpUser, task, between
 
+
 class QuickstartUser(HttpUser):
     wait_time = between(1, 2)
 
     def on_start(self):
-        self.client.post("/login", json={"username":"foo", "password":"bar"})
+        self.client.post("/login", json={"username": "foo", "password": "bar"})
 
     @task
     def hello_world(self):

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.46.7.dev2'
-__version_tuple__ = version_tuple = (2, 46, 7, 'dev2')
+__version__ = version = '2.46.7.dev7'
+__version_tuple__ = version_tuple = (2, 46, 7, 'dev7')
 
 __commit_id__ = commit_id = None

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/clients.py

@@ -8,7 +8,7 @@ import sys
 import time
 from contextlib import contextmanager
 from typing import TYPE_CHECKING, cast
-from urllib.parse import urlparse, urlunparse
+from urllib.parse import unquote, urlparse, urlunparse
 
 import requests
 from packaging.version import Version
@@ -104,16 +104,13 @@ class HttpSession(requests.Session):
         # Check for basic authentication
         parsed_url = urlparse(self.base_url)
         if parsed_url.username and parsed_url.password:
-            netloc = parsed_url.hostname
-            if parsed_url.port:
-                netloc += ":%d" % parsed_url.port
-
-            # remove username and password from the base_url
+            # remove username and password from the base_url (keeping e.g. the brackets of an IPv6 host)
+            netloc = parsed_url.netloc.rpartition("@")[2]
             self.base_url = urlunparse(
                 (parsed_url.scheme, netloc, parsed_url.path, parsed_url.params, parsed_url.query, parsed_url.fragment)
             )
-            # configure requests to use basic auth
-            self.auth = HTTPBasicAuth(parsed_url.username, parsed_url.password)
+            # configure requests to use basic auth (credentials in a URL are percent-encoded)
+            self.auth = HTTPBasicAuth(unquote(parsed_url.username), unquote(parsed_url.password))
 
         self.mount("https://", LocustHttpAdapter(pool_manager=pool_manager))
         self.mount("http://", LocustHttpAdapter(pool_manager=pool_manager))
@@ -198,7 +195,7 @@ class HttpSession(requests.Session):
         response = self._send_request_safe_mode(method, complete_url, data=data, json=json, **kwargs)
         response_time = (time.perf_counter() - start_perf_counter) * 1000
 
-        if request_before_redirect := (response.history and response.history[0] or response).request:
+        if request_before_redirect := ((response.history and response.history[0]) or response).request:
             complete_url = str(request_before_redirect.url)
             if not name:
                 name = request_before_redirect.path_url

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/contrib/fasthttp.py

@@ -15,7 +15,7 @@ from base64 import b64encode
 from http.cookiejar import CookieJar
 from ssl import SSLError
 from typing import TYPE_CHECKING
-from urllib.parse import urlparse, urlunparse
+from urllib.parse import unquote, urlparse, urlunparse
 
 import gevent
 from charset_normalizer import detect
@@ -128,11 +128,8 @@ class FastHttpSession:
         if self.base_url:
             parsed_url = urlparse(self.base_url)
             if parsed_url.username and parsed_url.password:
-                netloc = parsed_url.hostname or ""
-                if parsed_url.port:
-                    netloc += ":%d" % parsed_url.port
-
-                # remove username and password from the base_url
+                # remove username and password from the base_url (keeping e.g. the brackets of an IPv6 host)
+                netloc = parsed_url.netloc.rpartition("@")[2]
                 self.base_url = str(
                     urlunparse(
                         (
@@ -146,7 +143,8 @@ class FastHttpSession:
                     )
                 )
                 # store authentication header (we construct this by using _basic_auth_str() function from requests.auth)
-                self.auth_header = _construct_basic_auth_str(parsed_url.username, parsed_url.password)
+                # (credentials in a URL are percent-encoded)
+                self.auth_header = _construct_basic_auth_str(unquote(parsed_url.username), unquote(parsed_url.password))
 
     def _build_url(self, path: str) -> str:
         """prepend url with hostname unless it's already an absolute URL"""

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/runners.py

@@ -917,10 +917,8 @@ class MasterRunner(DistributedRunner):
         self.greenlet.kill(block=True)
 
     def check_stopped(self) -> None:
-        if (
-            self.state == STATE_STOPPING
-            and all(x.state == STATE_INIT for x in self.clients.all)
-            or all(x.state not in (STATE_RUNNING, STATE_SPAWNING, STATE_INIT) for x in self.clients.all)
+        if (self.state == STATE_STOPPING and all(x.state == STATE_INIT for x in self.clients.all)) or all(
+            x.state not in (STATE_RUNNING, STATE_SPAWNING, STATE_INIT) for x in self.clients.all
         ):
             self.update_state(STATE_STOPPED)
 
@@ -938,7 +936,7 @@ class MasterRunner(DistributedRunner):
                     missing_clients_to_be_removed.append(client.id)
 
                 if client.heartbeat < 0 and client.state != STATE_MISSING:
-                    logger.info(f"Worker {str(client.id)} failed to send heartbeat, setting state to missing.")
+                    logger.info(f"Worker {client.id!s} failed to send heartbeat, setting state to missing.")
                     client.state = STATE_MISSING
                     client.user_classes_count = {}
                     if self._users_dispatcher is not None:
@@ -1023,7 +1021,7 @@ class MasterRunner(DistributedRunner):
                 elif msg.data != __version__ and msg.data != -1:
                     if msg.data[0:4] == __version__[0:4]:
                         logger.debug(
-                            f"A worker ({client_id}) running a different patch version ({repr(msg.data)}) connected, master version is {repr(__version__)}"
+                            f"A worker ({client_id}) running a different patch version ({msg.data!r}) connected, master version is {__version__!r}"
                         )
                     else:
                         logger.warning(
@@ -1113,7 +1111,7 @@ class MasterRunner(DistributedRunner):
                     c.heartbeat = HEARTBEAT_LIVENESS
                     client_state = msg.data["state"]
                     if c.state == STATE_MISSING:
-                        logger.info(f"Worker {str(c.id)} self-healed with heartbeat, setting state to {client_state}.")
+                        logger.info(f"Worker {c.id!s} self-healed with heartbeat, setting state to {client_state}.")
                         if self._users_dispatcher is not None:
                             self._users_dispatcher.add_worker(worker_node=c)
                             if not self._users_dispatcher.dispatch_in_progress and self.state == STATE_RUNNING:

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/stats.py

@@ -539,7 +539,7 @@ class StatsEntry:
             # (which is what the response times cache is used for) uses an approximation of the
             # last 10 seconds anyway, it should be fine to ignore this.
             last_time = int(self.last_request_timestamp) if self.last_request_timestamp else None
-            if last_time and last_time > (old_last_request_timestamp and int(old_last_request_timestamp) or 0):
+            if last_time and last_time > ((old_last_request_timestamp and int(old_last_request_timestamp)) or 0):
                 self._cache_response_times(last_time)
 
     def serialize(self) -> StatsEntryDict:
@@ -585,7 +585,7 @@ class StatsEntry:
             + str((STATS_NAME_WIDTH - STATS_TYPE_WIDTH) + 4)
             + "s %7d %12s |%7d %7d %7d%7d | %7.2f %11.2f"
         ) % (
-            (self.method and self.method + " " or ""),
+            ((self.method and self.method + " ") or ""),
             self.name,
             self.num_requests,
             "%d(%.2f%%)" % (self.num_failures, self.fail_ratio * 100),
@@ -661,12 +661,15 @@ class StatsEntry:
         if not self.num_requests:
             raise ValueError("Can't calculate percentile on url with no successful requests")
 
-        tpl = f"%-{str(STATS_TYPE_WIDTH)}s %-{str(STATS_NAME_WIDTH)}s %8d {' '.join(['%6d'] * len(PERCENTILES_TO_REPORT))}"
+        tpl = f"%-{STATS_TYPE_WIDTH!s}s %-{STATS_NAME_WIDTH!s}s %8d {' '.join(['%6d'] * len(PERCENTILES_TO_REPORT))}"
 
         return tpl % (
-            (self.method or "", self.name)
-            + tuple(self.get_response_time_percentile(p) for p in PERCENTILES_TO_REPORT)
-            + (self.num_requests,)
+            (
+                self.method or "",
+                self.name,
+                *tuple(self.get_response_time_percentile(p) for p in PERCENTILES_TO_REPORT),
+                self.num_requests,
+            )
         )
 
     def _cache_response_times(self, t: int) -> None:
@@ -897,9 +900,9 @@ def get_percentile_stats_summary(stats: RequestStats) -> list[str]:
     Percentile stats summary will be returned as list of string
     """
     summary = ["Response time percentiles (approximated)"]
-    headers = ("Type", "Name") + tuple(get_readable_percentiles(PERCENTILES_TO_REPORT)) + ("# reqs",)
+    headers = ("Type", "Name", *tuple(get_readable_percentiles(PERCENTILES_TO_REPORT)), "# reqs")
     summary.append(
-        (f"%-{str(STATS_TYPE_WIDTH)}s %-{str(STATS_NAME_WIDTH)}s %8s {' '.join(['%6s'] * len(PERCENTILES_TO_REPORT))}")
+        f"%-{STATS_TYPE_WIDTH!s}s %-{STATS_NAME_WIDTH!s}s %8s {' '.join(['%6s'] * len(PERCENTILES_TO_REPORT))}"
         % headers
     )
     separator = (
@@ -1008,7 +1011,8 @@ class StatsCSV:
             "Average Content Size",
             "Requests/s",
             "Failures/s",
-        ] + get_readable_percentiles(self.percentiles_to_report)
+            *get_readable_percentiles(self.percentiles_to_report),
+        ]
 
         self.failures_columns = [
             "Method",
@@ -1190,8 +1194,8 @@ class StatsCSVFileWriter(StatsCSV):
 
     def _stats_history_data_rows(self, csv_writer: CSVWriter, now: float) -> None:
         """
-        Write CSV rows with the *current* stats. By default only includes the
-        Aggregated stats entry, but if self.full_history is set to True, a row for each entry will
+        Write CSV rows with the *current* stats. By default, only includes the
+        Aggregated stats entry, but if self.full_history is set to True, a row for each entry
         will be included.
 
         Note that this method differs from the other methods as it appends time-stamped data to the file, whereas the other methods overwrites the data.

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/util/cache.py

@@ -24,10 +24,8 @@ def memoize(timeout, dynamic_timeout=False):
             return cache["result"]
 
         def clear_cache():
-            if "time" in cache:
-                del cache["time"]
-            if "result" in cache:
-                del cache["result"]
+            cache.pop("time", None)
+            cache.pop("result", None)
 
         wrapper.clear_cache = clear_cache
         return wrapper

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/util/date.py

@@ -20,4 +20,4 @@ def format_duration(start_time, end_time):
 
     parts = [f"{value} {label}{'s' if value != 1 else ''}" for value, label in time_parts if value > 0]
 
-    return " and ".join(filter(None, [", ".join(parts[:-1])] + parts[-1:])) if parts else "0 seconds"
+    return " and ".join(filter(None, [", ".join(parts[:-1]), *parts[-1:]])) if parts else "0 seconds"

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/util/exception_handler.py

@@ -8,7 +8,7 @@ def retry(delays=(1, 3, 5), exception=Exception):
     def decorator(function):
         def wrapper(*args, **kwargs):
             cnt = 0
-            for delay in delays + (None,):
+            for delay in (*delays, None):
                 try:
                     return function(*args, **kwargs)
                 except exception as e:

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/web.py

@@ -274,7 +274,7 @@ class WebUI:
                             err_msg = f"Invalid user_count value: {value!r} (must be an integer)"
                             logger.error(err_msg)
                             return jsonify({"success": False, "message": err_msg, "host": environment.host})
-                        parsed_options_dict["users"] = user_count
+                        parsed_options_dict["num_users"] = user_count
                     case "spawn_rate":
                         try:
                             spawn_rate = float(value)

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/pyproject.toml

@@ -81,7 +81,7 @@ test = [
 ]
 lint = [
     "pre-commit>=4.5.0,<5.0.0",
-    "ruff==0.15.12",
+    "ruff==0.16.8",
     "mypy>=1.13.0,<1.15.0",
     "types-requests==2.32.4.20250809",
     "typos>=1.50.1"
@@ -159,8 +159,8 @@ extend-exclude = [
     "src/readthedocs-sphinx-search/",
     "examples/grpc/hello_pb2*.py",
 ]
-lint.ignore = ["E402", "E501", "E713", "E731", "E741", "UP031", "PERF203"]
-lint.select = ["E", "F", "W", "UP", "FA102", "I001", "FURB", "PERF"]
+lint.ignore = ["E402", "E501", "E713", "E731", "E741", "UP031", "PERF203", "RUF012", "RUF059", "RUF015"]
+lint.select = ["E", "F", "W", "UP", "FA102", "I001", "FURB", "PERF", "RUF"]
 lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?)|resp)$"
 
 [tool.ruff.lint.per-file-ignores]

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/__init__.py

@@ -36,28 +36,28 @@ from .user.wait_time import between, constant, constant_pacing, constant_through
 events = Events()
 
 __all__ = (
-    "SequentialTaskSet",
+    "FastHttpUser",
+    "HttpLocust",
+    "HttpUser",
+    "LoadTestShape",
+    "Locust",
     "MarkovTaskSet",
-    "transition",
-    "transitions",
-    "wait_time",
-    "task",
-    "tag",
+    "SequentialTaskSet",
     "TaskSet",
-    "HttpUser",
-    "FastHttpUser",
     "User",
+    "__version__",
     "between",
     "constant",
     "constant_pacing",
     "constant_throughput",
-    "poisson",
     "events",
-    "LoadTestShape",
+    "poisson",
     "run_single_user",
-    "HttpLocust",
-    "Locust",
-    "__version__",
+    "tag",
+    "task",
+    "transition",
+    "transitions",
+    "wait_time",
 )
 
 # Used for raising a DeprecationWarning if old Locust/HttpLocust is used

{locust-2.46.7.dev2 → locust-2.46.7.dev7}/locust/user/__init__.py

@@ -1,9 +1,9 @@
 __all__ = (
     "HttpUser",
-    "tag",
-    "task",
     "TaskSet",
     "User",
+    "tag",
+    "task",
 )
 from .task import TaskSet, tag, task
 from .users import HttpUser, User