mypy fixes

andgineer · Sep 1, 2021 · cd97e2b · cd97e2b
1 parent 5cb1737
commit cd97e2b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/bombard/bombardier.py b/bombard/bombardier.py
@@ -1,6 +1,6 @@
 import json
 import logging
-from typing import Any, Dict, List, Mapping, Optional
+from typing import Any, Dict, List, Mapping, Optional, Set
 from urllib.parse import urlparse
 
 from bombard import request_logging
@@ -15,7 +15,7 @@
 
 log = logging.getLogger()
 
-DEFAULT_OK = [200]
+DEFAULT_OK = {200}
 DEFAULT_OVERLOAD = [502, 504]
 PREPARE = "prepare"
 AMMO = "ammo"
@@ -51,10 +51,10 @@ class Bombardier(WeaverMill):
 
     def __init__(
         self,
+        args: object,
         supply: Optional[Dict[str, Any]] = None,
-        args: Optional[Any] = None,
         campaign_book: Optional[Dict[str, Any]] = None,
-        ok_statuses: Optional[List[int]] = None,
+        ok_statuses: Optional[Set[int]] = None,
         overload_statuses: Optional[List[int]] = None,
     ):
         self.supply = supply if supply is not None else {}

diff --git a/bombard/main.py b/bombard/main.py
@@ -98,7 +98,7 @@ def start_campaign(args, campaign_book):
 
     add_names_to_requests(campaign_book)
 
-    bombardier = Bombardier(supply, args, campaign_book)
+    bombardier = Bombardier(args, supply, campaign_book)
     if PREPARE in campaign_book:
         for ammo in campaign_book[PREPARE].values():
             bombardier.reload(ammo, repeat=1, prepare=True)

diff --git a/bombard/pretty_ns.py b/bombard/pretty_ns.py
@@ -19,9 +19,11 @@
 True
 
 """
-from typing import Any, Optional
+from typing import Any, Callable, Optional
 
-time_ns = None  # for Python3.7+ this is function from system library time
+time_ns: Optional[
+    Callable[[], int]
+] = None  # for Python3.7+ this is function from system library time
 
 
 # for earlier Python versions this is emulation of the Python3.7 time_ns

diff --git a/bombard/report.py b/bombard/report.py
@@ -8,7 +8,7 @@
 import statistics
 from array import array
 from copy import deepcopy
-from typing import Optional, Set
+from typing import Any, Dict, Optional, Set
 
 from bombard.pretty_ns import pretty_ns, time_ns
 from bombard.pretty_sz import pretty_sz
@@ -42,7 +42,7 @@ def __init__(
         :param time_threshold_ms: show times bigger than that in red
         :param success_statuses: set of statuses treated as success
         """
-        self.DIMENSIONS = {
+        self.DIMENSIONS: Dict[str, Dict[str, Any]] = {
             TIME: {
                 "type": ARRAY_UINT64,
                 "pretty_func": self.pretty_time,