forked from p15670423/monkey
Agent: Rename typing to custom_types
Naming the module "typing" and then importing from "typing" within the module itself caused some confusion for python and resulted in failed builds.
This commit is contained in:
parent
8733d3f6c4
commit
d596e8c593
|
@ -2,9 +2,9 @@ import logging
|
|||
from typing import Any, Iterable, Mapping
|
||||
|
||||
from common.common_consts.credential_component_type import CredentialComponentType
|
||||
from infection_monkey.custom_types import PropagationCredentials
|
||||
from infection_monkey.i_control_channel import IControlChannel
|
||||
from infection_monkey.i_puppet import Credentials
|
||||
from infection_monkey.typing import PropagationCredentials
|
||||
from infection_monkey.utils.decorators import request_cache
|
||||
|
||||
from .i_credentials_store import ICredentialsStore
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import abc
|
||||
from typing import Iterable
|
||||
|
||||
from infection_monkey.custom_types import PropagationCredentials
|
||||
from infection_monkey.i_puppet import Credentials
|
||||
from infection_monkey.typing import PropagationCredentials
|
||||
|
||||
|
||||
class ICredentialsStore(metaclass=abc.ABCMeta):
|
||||
|
|
|
@ -6,8 +6,8 @@ import requests
|
|||
from common.common_consts.timeouts import SHORT_REQUEST_TIMEOUT
|
||||
from infection_monkey.config import WormConfiguration
|
||||
from infection_monkey.control import ControlClient
|
||||
from infection_monkey.custom_types import PropagationCredentials
|
||||
from infection_monkey.i_control_channel import IControlChannel, IslandCommunicationError
|
||||
from infection_monkey.typing import PropagationCredentials
|
||||
|
||||
requests.packages.urllib3.disable_warnings()
|
||||
|
||||
|
|
|
@ -7,9 +7,9 @@ from queue import Queue
|
|||
from threading import Event
|
||||
from typing import Callable, Dict, List, Mapping
|
||||
|
||||
from infection_monkey.custom_types import PropagationCredentials
|
||||
from infection_monkey.i_puppet import ExploiterResultData, IPuppet
|
||||
from infection_monkey.model import VictimHost
|
||||
from infection_monkey.typing import PropagationCredentials
|
||||
from infection_monkey.utils.threading import interruptible_iter, run_worker_threads
|
||||
|
||||
QUEUE_TIMEOUT = 2
|
||||
|
|
Loading…
Reference in New Issue