Clean up imports

Author: mdelotavo

apigee/__main__.py

@@ -18,7 +18,8 @@
 from apigee.configure.commands import configure
 from apigee.deployments.commands import deployments
 from apigee.developers.commands import developers
-from apigee.exceptions import wrap_with_exception_handling, configure_global_logger
+from apigee.exceptions import (configure_global_logger,
+                               wrap_with_exception_handling)
 from apigee.keystores.commands import keystores
 from apigee.keyvaluemaps.commands import keyvaluemaps
 from apigee.maskconfigs.commands import maskconfigs
@@ -28,8 +29,8 @@
 from apigee.sharedflows.commands import sharedflows
 from apigee.targetservers.commands import targetservers
 from apigee.userroles.commands import userroles
-from apigee.utils import (import_plugins_from_directory,
-                          execute_function_on_directory_files)
+from apigee.utils import (execute_function_on_directory_files,
+                          import_plugins_from_directory)
 from apigee.virtualhosts.commands import virtualhosts
 
 # from click_aliases import ClickAliasedGroup

apigee/apis/api_puller_with_dependency_extraction.py

@@ -8,14 +8,10 @@
 from apigee.caches.caches import Caches
 from apigee.keyvaluemaps.keyvaluemaps import Keyvaluemaps
 from apigee.targetservers.targetservers import Targetservers
-from apigee.utils import (
-    extract_zip_file,
-    create_directory,
-    check_file_exists,
-    check_files_exist,
-    execute_function_on_directory_files,
-    apply_function_on_iterable,
-)
+from apigee.utils import (apply_function_on_iterable, check_file_exists,
+                          check_files_exist, create_directory,
+                          execute_function_on_directory_files,
+                          extract_zip_file)
 
 # ---------------------------
 # Internal Helper for XML Parsing

apigee/apis/commands.py

@@ -2,9 +2,10 @@
 from click_option_group import MutuallyExclusiveOptionGroup, optgroup
 
 from apigee import console
+from apigee.apis.api_puller_with_dependency_extraction import \
+    ApiPullerWithDependencyExtraction
 from apigee.apis.apis import Apis
 from apigee.apis.deploy import deploy as deploy_tool
-from apigee.apis.api_puller_with_dependency_extraction import ApiPullerWithDependencyExtraction
 from apigee.auth import common_auth_options, generate_authentication
 from apigee.prefix import common_prefix_options
 from apigee.silent import common_silent_options

apigee/apis/serializer.py

@@ -1,6 +1,6 @@
 import json
 
-from apigee.utils import remove_last_elements, apply_function_on_iterable
+from apigee.utils import apply_function_on_iterable, remove_last_elements
 
 
 class ApisSerializer:

apigee/auth.py

@@ -1,6 +1,7 @@
 import base64
 import binascii
 import configparser
+import contextlib
 import os
 import sys
 import time
@@ -10,7 +11,6 @@
 import webbrowser
 
 import click
-import contextlib
 import jwt
 import pyotp
 import requests
@@ -19,9 +19,8 @@
 
 from apigee import (APIGEE_CLI_ACCESS_TOKEN_FILE, APIGEE_CLI_CREDENTIALS_FILE,
                     APIGEE_CLI_DIRECTORY, APIGEE_CLI_IS_MACHINE_USER,
-                    APIGEE_OAUTH_URL, APIGEE_SAML_LOGIN_URL,
-                    APIGEE_ZONENAME_OAUTH_URL, console,
-                    APIGEE_CLI_REFRESH_TOKEN_FILE)
+                    APIGEE_CLI_REFRESH_TOKEN_FILE, APIGEE_OAUTH_URL,
+                    APIGEE_SAML_LOGIN_URL, APIGEE_ZONENAME_OAUTH_URL, console)
 from apigee.cls import AliasedGroup
 from apigee.silent import common_silent_options
 from apigee.types import Struct

apigee/backups/backups.py

@@ -1,8 +1,8 @@
 import json
 import os
-from typing import Any, List, Optional, Set, Dict
 from dataclasses import dataclass, field
 from pathlib import Path
+from typing import Any, Dict, List, Optional, Set
 
 from requests.exceptions import HTTPError
 from tqdm import tqdm
@@ -17,14 +17,10 @@
 from apigee.keyvaluemaps.keyvaluemaps import Keyvaluemaps
 from apigee.permissions.permissions import Permissions
 from apigee.targetservers.targetservers import Targetservers
-from apigee.types import APIGEE_API_CHOICES, empty_snapshot, Struct
+from apigee.types import APIGEE_API_CHOICES, Struct, empty_snapshot
 from apigee.userroles.userroles import Userroles
-from apigee.utils import (
-    extract_zip_file,
-    filter_out_empty_values,
-    get_resolved_directory_path,
-    write_content_to_file,
-)
+from apigee.utils import (extract_zip_file, filter_out_empty_values,
+                          get_resolved_directory_path, write_content_to_file)
 
 # ==============================
 # Path Templates

apigee/encryption_utils.py

@@ -1,7 +1,8 @@
 import base64
-import gnupg
 import sys
 
+import gnupg
+
 # Constants
 ENCRYPTED_HEADER_BEGIN = "-----BEGIN ENCRYPTED APIGEE CLI MESSAGE-----"
 ENCRYPTED_HEADER_END = "-----END ENCRYPTED APIGEE CLI MESSAGE-----"

apigee/exceptions.py

@@ -6,7 +6,7 @@
 import sys
 
 from apigee import console
-from apigee.utils import remove_file_if_above_size, create_empty_file
+from apigee.utils import create_empty_file, remove_file_if_above_size
 
 
 class InvalidApisError(Exception):

apigee/keyvaluemaps/keyvaluemaps.py

@@ -7,13 +7,11 @@
 from tqdm import tqdm
 
 from apigee import APIGEE_ADMIN_API_URL, auth, console
-from apigee.encryption_utils import (
-    ENCRYPTED_HEADER_BEGIN,
-    ENCRYPTED_HEADER_END,
-    decrypt_message_with_gpg,
-    encrypt_message_with_gpg,
-    has_encrypted_header,
-)
+from apigee.encryption_utils import (ENCRYPTED_HEADER_BEGIN,
+                                     ENCRYPTED_HEADER_END,
+                                     decrypt_message_with_gpg,
+                                     encrypt_message_with_gpg,
+                                     has_encrypted_header)
 from apigee.keyvaluemaps.serializer import KeyvaluemapsSerializer
 from apigee.utils import get_tqdm_kwargs, read_file_content
 

apigee/plugins/commands.py

@@ -13,10 +13,9 @@
                     APIGEE_CLI_PLUGINS_DIRECTORY, APIGEE_CLI_PLUGINS_PATH,
                     console)
 from apigee.silent import common_silent_options
-from apigee.utils import (is_directory, is_regular_file, create_directory,
-                          read_file_content,
-                          execute_function_on_directory_files,
-                          create_empty_file)
+from apigee.utils import (create_directory, create_empty_file,
+                          execute_function_on_directory_files, is_directory,
+                          is_regular_file, read_file_content)
 from apigee.verbose import common_verbose_options
 
 is_git_installed = False