Change property names. Add type hints

monkey/infection_monkey/network/HostFinger.py

@@ -3,8 +3,9 @@ from abc import ABCMeta, abstractproperty, abstractmethod
 from infection_monkey.config import WormConfiguration
 
 
-class HostFinger(object, metaclass=ABCMeta):
+class HostFinger(metaclass=ABCMeta):
-    @abstractproperty
+    @property
+    @abstractmethod
     def _SCANNED_SERVICE(self):
         pass
 
@@ -18,9 +19,5 @@ class HostFinger(object, metaclass=ABCMeta):
         raise NotImplementedError()
 
     @staticmethod
-    def should_run(class_name):
+    def should_run(class_name: str) -> bool:
-        """
-        Decides if post breach action is enabled in config
-        :return: True if it needs to be ran, false otherwise
-        """
         return class_name in WormConfiguration.finger_classes

monkey/infection_monkey/network/HostScanner.py

@@ -1,7 +1,8 @@
 from abc import ABCMeta, abstractmethod
 
 
-class HostScanner(object, metaclass=ABCMeta):
+class HostScanner(metaclass=ABCMeta):
+    @property
     @abstractmethod
     def is_host_alive(self, host):
         raise NotImplementedError()

monkey/infection_monkey/network/fingerprinter_manager.py

@@ -1,11 +1,12 @@
 import logging
+from typing import Sequence
 from infection_monkey.utils.load_plugins import get_instances
 from infection_monkey.network.HostFinger import HostFinger
 
 LOG = logging.getLogger(__name__)
 
 
-def get_fingerprint_instances():
+def get_fingerprint_instances() -> Sequence[HostFinger]:
     """
     Returns the fingerprint objects according to configuration as a list
     :return: A list of HostFinger objects.