Sorted imports

mvt/android/cli.py

@@ -3,10 +3,10 @@
 # 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 os
 import getpass
 import io
+import logging
+import os
 import tarfile
 from pathlib import Path
 from zipfile import ZipFile
@@ -14,14 +14,15 @@ from zipfile import ZipFile
 import click
 from rich.logging import RichHandler
 
+from mvt.android.parsers.backup import (AndroidBackupParsingError,
+                                        InvalidBackupPassword, parse_ab_header,
+                                        parse_backup_file)
 from mvt.common.help import (HELP_MSG_FAST, HELP_MSG_IOC,
                              HELP_MSG_LIST_MODULES, HELP_MSG_MODULE,
                              HELP_MSG_OUTPUT, HELP_MSG_SERIAL)
 from mvt.common.indicators import Indicators, download_indicators_files
 from mvt.common.logo import logo
 from mvt.common.module import run_module, save_timeline
-from mvt.android.parsers.backup import parse_ab_header, parse_backup_file
-from mvt.android.parsers.backup import InvalidBackupPassword, AndroidBackupParsingError
 
 from .download_apks import DownloadAPKs
 from .lookups.koodous import koodous_lookup

mvt/android/modules/adb/base.py

@@ -3,6 +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 base64
+import getpass
 import logging
 import os
 import random
@@ -10,8 +12,6 @@ import string
 import sys
 import tempfile
 import time
-import base64
-import getpass
 
 from adb_shell.adb_device import AdbDeviceTcp, AdbDeviceUsb
 from adb_shell.auth.keygen import keygen, write_public_keyfile
@@ -20,8 +20,9 @@ from adb_shell.exceptions import (AdbCommandFailureException, DeviceAuthError,
                                   UsbDeviceNotFoundError, UsbReadFailedError)
 from usb1 import USBErrorAccess, USBErrorBusy
 
+from mvt.android.parsers.backup import (InvalidBackupPassword, parse_ab_header,
+                                        parse_backup_file)
 from mvt.common.module import InsufficientPrivileges, MVTModule
-from mvt.android.parsers.backup import parse_ab_header, parse_backup_file, InvalidBackupPassword
 
 log = logging.getLogger(__name__)
 

mvt/android/modules/adb/sms.py

@@ -3,15 +3,16 @@
 # 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 sqlite3
-import base64
-import getpass
 
-from mvt.common.utils import check_for_links, convert_timestamp_to_iso
-from mvt.android.parsers.backup import parse_tar_for_sms, AndroidBackupParsingError
+from mvt.android.parsers.backup import (AndroidBackupParsingError,
+                                        parse_tar_for_sms)
 from mvt.common.module import InsufficientPrivileges
+from mvt.common.utils import check_for_links, convert_timestamp_to_iso
 
 from .base import AndroidExtraction
 

mvt/android/modules/backup/base.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 os
 import fnmatch
+import os
 
 from mvt.common.module import MVTModule
 

mvt/android/modules/backup/sms.py

@@ -4,8 +4,8 @@
 #   https://license.mvt.re/1.1/
 
 from mvt.android.modules.backup.base import BackupExtraction
-from mvt.common.utils import check_for_links
 from mvt.android.parsers.backup import parse_sms_file
+from mvt.common.utils import check_for_links
 
 
 class SMS(BackupExtraction):

mvt/android/parsers/backup.py

@@ -3,17 +3,17 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
+import datetime
 import io
-import zlib
 import json
 import tarfile
-import datetime
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from cryptography.hazmat.primitives import padding
-from mvt.common.utils import check_for_links, convert_timestamp_to_iso
+import zlib
 
+from cryptography.hazmat.primitives import hashes, padding
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
+
+from mvt.common.utils import check_for_links, convert_timestamp_to_iso
 
 PBKDF2_KEY_SIZE = 32
 

tests/android/test_backup_module.py

@@ -3,14 +3,14 @@
 # Use of this software is governed by the MVT License 1.1 that can be found at
 #   https://license.mvt.re/1.1/
 
+import io
 import logging
 import os
 import tarfile
-import io
 
 from mvt.android.modules.backup.sms import SMS
-from mvt.common.module import run_module
 from mvt.android.parsers.backup import parse_backup_file
+from mvt.common.module import run_module
 
 from ..utils import get_android_backup_folder
 

tests/android/test_backup_parser.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 hashlib
+import logging
 
 from mvt.android.parsers.backup import parse_backup_file, parse_tar_for_sms