Merge pull request #2240 from locustio/small-performance-enhancements

Tiny performance enhancements

locust/contrib/fasthttp.py

@@ -127,13 +127,12 @@ def _send_request_safe_mode(self, method, url, **kwargs):
             if hasattr(e, "response"):
                 r = e.response
             else:
-                safe_kwargs = kwargs or {}
                 req = self.client._make_request(
                     url,
                     method=method,
-                    headers=safe_kwargs.get("headers", None),
-                    payload=safe_kwargs.get("payload", None),
-                    params=safe_kwargs.get("params", None),
+                    headers=kwargs.get("headers"),
+                    payload=kwargs.get("payload"),
+                    params=kwargs.get("params"),
                 )
                 r = ErrorResponse(url=url, request=req)
             r.error = e
@@ -429,7 +428,7 @@ def status_code(self) -> int:
         We override status_code in order to return None if no valid response was
         returned. E.g. in the case of connection errors
         """
-        return self._response is not None and self._response.get_code() or 0
+        return self._response.get_code() if self._response is not None else 0
 
     def _content(self):
         if self.headers is None:

locust/stats.py

@@ -271,9 +271,7 @@ def clear_all(self) -> None:
 
     def serialize_stats(self) -> List["StatsEntryDict"]:
         return [
-            self.entries[key].get_stripped_report()
-            for key in self.entries.keys()
-            if not (self.entries[key].num_requests == 0 and self.entries[key].num_failures == 0)
+            e.get_stripped_report() for e in self.entries.values() if not (e.num_requests == 0 and e.num_failures == 0)
         ]
 
     def serialize_errors(self) -> Dict[str, "StatsErrorDict"]:
@@ -844,10 +842,9 @@ def get_percentile_stats_summary(stats: RequestStats) -> List[str]:
 
 
 def print_error_report(stats: RequestStats) -> None:
-    if not len(stats.errors):
-        return
-    for line in get_error_report_summary(stats):
-        console_logger.info(line)
+    if stats.errors:
+        for line in get_error_report_summary(stats):
+            console_logger.info(line)
 
 
 def get_error_report_summary(stats) -> List[str]:

locust/user/inspectuser.py

@@ -41,8 +41,8 @@ def _calc_distribution(user_classes, num_users):
 
 
 def _print_task_ratio(x, level=0):
+    padding = 2 * " " * level
     for k, v in x.items():
-        padding = 2 * " " * level
         ratio = v.get("ratio", 1)
         print(" %-10s %-50s" % (padding + "%-6.1f" % (ratio * 100), padding + k))
         if "tasks" in v: