From 7222bc82e1c7ceeed17cc8d70d3708a05ba829c7 Mon Sep 17 00:00:00 2001
From: Nex <nex@nex.sx>
Date: Wed, 29 Jun 2022 00:05:36 +0200
Subject: [PATCH] Sorting imports and removing unused ones

---
 mvt/ios/cmd_check_usb.py            |  3 ++-
 mvt/ios/modules/usb/applications.py |  4 +++-
 mvt/ios/modules/usb/base.py         | 11 +----------
 mvt/ios/modules/usb/device_info.py  |  2 +-
 mvt/ios/modules/usb/processes.py    |  1 +
 tests/ios_usb/test_applications.py  |  4 ++--
 tests/ios_usb/test_device_info.py   |  4 ++--
 tests/ios_usb/test_processes.py     |  4 +---
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/mvt/ios/cmd_check_usb.py b/mvt/ios/cmd_check_usb.py
index 51ac7b1..0a48f1d 100644
--- a/mvt/ios/cmd_check_usb.py
+++ b/mvt/ios/cmd_check_usb.py
@@ -5,8 +5,9 @@
 
 import logging
 import sys
-from pymobiledevice3.lockdown import LockdownClient
+
 from pymobiledevice3.exceptions import ConnectionFailedError
+from pymobiledevice3.lockdown import LockdownClient
 
 from mvt.common.command import Command
 
diff --git a/mvt/ios/modules/usb/applications.py b/mvt/ios/modules/usb/applications.py
index 85e1c2d..d010469 100644
--- a/mvt/ios/modules/usb/applications.py
+++ b/mvt/ios/modules/usb/applications.py
@@ -4,7 +4,9 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-from pymobiledevice3.services.installation_proxy import InstallationProxyService
+
+from pymobiledevice3.services.installation_proxy import \
+    InstallationProxyService
 
 from .base import IOSUSBExtraction
 
diff --git a/mvt/ios/modules/usb/base.py b/mvt/ios/modules/usb/base.py
index 0ed0076..e08e232 100644
--- a/mvt/ios/modules/usb/base.py
+++ b/mvt/ios/modules/usb/base.py
@@ -3,18 +3,9 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
-import base64
-import getpass
 import logging
-import os
-import random
-import string
-import sys
-import tempfile
-import time
-from typing import Callable
 
-from mvt.common.module import InsufficientPrivileges, MVTModule
+from mvt.common.module import MVTModule
 
 log = logging.getLogger(__name__)
 
diff --git a/mvt/ios/modules/usb/device_info.py b/mvt/ios/modules/usb/device_info.py
index 16a03cb..de7cafc 100644
--- a/mvt/ios/modules/usb/device_info.py
+++ b/mvt/ios/modules/usb/device_info.py
@@ -3,8 +3,8 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
-import logging
 import base64
+import logging
 
 from mvt.ios.versions import latest_ios_version
 
diff --git a/mvt/ios/modules/usb/processes.py b/mvt/ios/modules/usb/processes.py
index 0c9137a..8663da2 100644
--- a/mvt/ios/modules/usb/processes.py
+++ b/mvt/ios/modules/usb/processes.py
@@ -4,6 +4,7 @@
 #   https://license.mvt.re/1.1/
 
 import logging
+
 from pymobiledevice3.services.os_trace import OsTraceService
 
 from .base import IOSUSBExtraction
diff --git a/tests/ios_usb/test_applications.py b/tests/ios_usb/test_applications.py
index e8493fb..90607ea 100644
--- a/tests/ios_usb/test_applications.py
+++ b/tests/ios_usb/test_applications.py
@@ -5,14 +5,14 @@
 
 import logging
 
+from pymobiledevice3.lockdown import LockdownClient
+
 from mvt.common.module import run_module
 from mvt.ios.modules.usb.applications import Applications
-from pymobiledevice3.lockdown import LockdownClient
 
 
 class TestUSBApplication:
     def test_run(self, mocker):
-        # Mock
         mocker.patch("pymobiledevice3.lockdown.LockdownClient.start_service")
         mocker.patch("pymobiledevice3.usbmux.select_device")
         mocker.patch("pymobiledevice3.service_connection.ServiceConnection.create")
diff --git a/tests/ios_usb/test_device_info.py b/tests/ios_usb/test_device_info.py
index ca435df..349623d 100644
--- a/tests/ios_usb/test_device_info.py
+++ b/tests/ios_usb/test_device_info.py
@@ -5,14 +5,14 @@
 
 import logging
 
+from pymobiledevice3.lockdown import LockdownClient
+
 from mvt.common.module import run_module
 from mvt.ios.modules.usb.device_info import DeviceInfo
-from pymobiledevice3.lockdown import LockdownClient
 
 
 class TestUSBDeviceInfo:
     def test_run(self, mocker):
-        # Mock
         mocker.patch("pymobiledevice3.usbmux.select_device")
         mocker.patch("pymobiledevice3.service_connection.ServiceConnection.create")
         mocker.patch(
diff --git a/tests/ios_usb/test_processes.py b/tests/ios_usb/test_processes.py
index 9fc5567..26c446f 100644
--- a/tests/ios_usb/test_processes.py
+++ b/tests/ios_usb/test_processes.py
@@ -5,21 +5,19 @@
 
 import logging
 
+from mvt.common.indicators import Indicators
 from mvt.common.module import run_module
 from mvt.ios.modules.usb.processes import Processes
-from mvt.common.indicators import Indicators
 
 
 class TestUSBProcesses:
     def test_run(self, mocker, indicator_file):
-        # Mock
         mocker.patch("pymobiledevice3.services.base_service.BaseService.__init__")
         mocker.patch(
             "pymobiledevice3.services.os_trace.OsTraceService.get_pid_list",
             return_value={"Payload": {"1": {"ProcessName": "storebookkeeperd"}, "1854": {"ProcessName": "cfprefssd"}}}
         )
 
-        # indicators
         ind = Indicators(log=logging)
         ind.parse_stix2(indicator_file)
         ind.ioc_collections[0]["processes"].append("cfprefssd")