locust 2.46.5.dev2__tar.gz → 2.46.5.dev5__tar.gz

{locust-2.46.5.dev2 → locust-2.46.5.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: locust
-Version: 2.46.5.dev2
+Version: 2.46.5.dev5
 Summary: Developer-friendly load testing framework
 Project-URL: Homepage, https://locust.cloud/
 Project-URL: Repository, https://github.com/locustio/locust

{locust-2.46.5.dev2 → locust-2.46.5.dev5}/locust/_version.py

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

{locust-2.46.5.dev2 → locust-2.46.5.dev5}/locust/debug.py

@@ -8,7 +8,7 @@ from locust.exception import CatchResponseError, RescheduleTask
 
 import inspect
 import os
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -78,7 +78,7 @@ class PrintListener:
 
         if self.include_time:
             if start_time:
-                _print_t(datetime.fromtimestamp(start_time, tz=timezone.utc))
+                _print_t(datetime.fromtimestamp(start_time, tz=UTC))
             else:
                 _print_t(datetime.now())
 

{locust-2.46.5.dev2 → locust-2.46.5.dev5}/locust/util/date.py

@@ -1,8 +1,8 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 
 def format_utc_timestamp(unix_timestamp):
-    return datetime.fromtimestamp(int(unix_timestamp), timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
+    return datetime.fromtimestamp(int(unix_timestamp), UTC).strftime("%Y-%m-%dT%H:%M:%SZ")
 
 
 def format_safe_timestamp(unix_timestamp):

{locust-2.46.5.dev2 → locust-2.46.5.dev5}/locust/web.py

@@ -183,9 +183,10 @@ class WebUI:
         def handle_exception(error):
             error_message = str(error)
             error_code = getattr(error, "code", 500)
+            error_name = getattr(error, "name", type(error).__name__)
             logger.log(
                 logging.DEBUG if error_code <= 404 else logging.ERROR,
-                f"UI got request for {request.method} {request.path}, but it resulted in a {error_code}: {error.name}",
+                f"UI got request for {request.method} {request.path}, but it resulted in a {error_code}: {error_name}",
             )
             return make_response(error_message, error_code)
 
@@ -260,10 +261,20 @@ class WebUI:
             for key, value in request.form.items():
                 match key:
                     case "user_count":  # if we just renamed this field to "users" we wouldn't need this
-                        user_count = int(value)
+                        try:
+                            user_count = int(value)
+                        except ValueError:
+                            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
                     case "spawn_rate":
-                        spawn_rate = float(value)
+                        try:
+                            spawn_rate = float(value)
+                        except ValueError:
+                            err_msg = f"Invalid spawn_rate value: {value!r} (must be a number)"
+                            logger.error(err_msg)
+                            return jsonify({"success": False, "message": err_msg, "host": environment.host})
                         parsed_options_dict[key] = spawn_rate
                     case "host":
                         # Replace < > to guard against XSS

{locust-2.46.5.dev2 → locust-2.46.5.dev5}/pyproject.toml

@@ -149,13 +149,14 @@ local_scheme = "no-local-version"
 [tool.hatch.build.targets.BuildFrontend.hooks.custom]
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py311"
 line-length = 120
+force-exclude = true
 extend-exclude = [
     "build",
     "examples/issue_*.py",
     "src/readthedocs-sphinx-search/",
-    "examples/grpc/hello_pb2.py",
+    "examples/grpc/hello_pb2*.py",
 ]
 lint.ignore = ["E402", "E501", "E713", "E731", "E741", "UP031", "PERF203"]
 lint.select = ["E", "F", "W", "UP", "FA102", "I001", "FURB", "PERF"]

{locust-2.46.5.dev2 → locust-2.46.5.dev5}/locust/argument_parser.py

@@ -15,6 +15,7 @@ import socket
 import sys
 import tempfile
 import textwrap
+import tomllib
 from collections import OrderedDict
 from typing import Any, NamedTuple
 from urllib.parse import urlparse
@@ -23,7 +24,6 @@ from uuid import uuid4
 import configargparse
 import gevent
 import requests
-import tomllib
 
 from .util.directory import get_abspaths_in
 from .util.timespan import parse_timespan