Reduce scope of changes

Author: AlanCoding

ansible_base/jwt_consumer/common/util.py

@@ -7,7 +7,6 @@
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import padding
 
-from ansible_base.jwt_consumer.common.cert import JWTCert, JWTCertException
 from ansible_base.lib.utils.settings import get_setting
 
 logger = logging.getLogger('ansible_base.jwt_consumer.common.util')
@@ -32,6 +31,8 @@ def generate_x_trusted_proxy_header(key: str) -> str:
 
 
 def validate_x_trusted_proxy_header(header_value: str, ignore_cache=False) -> bool:
+    from ansible_base.jwt_consumer.common.cert import JWTCert, JWTCertException
+
     try:
         cert = JWTCert()
         cert.get_decryption_key(ignore_cache=ignore_cache)

ansible_base/lib/templatetags/requests.py

@@ -11,6 +11,7 @@ def is_proxied_request():
 # Auto-register when imported in Django context
 try:
     from django import template
+
     register = template.Library()
     register.simple_tag(is_proxied_request)
 except ImportError:

ansible_base/lib/utils/create_system_user.py

@@ -68,4 +68,5 @@ def get_system_username() -> Tuple[Optional[str], str]:
 
     from django.core.exceptions import ImproperlyConfigured
     from django.utils.translation import gettext as _
+
     raise ImproperlyConfigured(_("Setting %(setting_name)s needs to be a string not a %(type)s") % {'setting_name': setting_name, 'type': type(value)})

test_app/tests/lib/utils/test_requests.py

@@ -103,7 +103,7 @@ def test_get_remote_hosts_alternate_headers_behind_trusted_proxy(rsa_keypair):
             assert remote_hosts == ['5.6.7.8', '9.10.11.12', '5.6.7.8', 'a.b.c.d']
 
 
-@mock.patch("ansible_base.lib.utils.requests.validate_x_trusted_proxy_header", side_effect=Exception)
+@mock.patch("ansible_base.jwt_consumer.common.util.validate_x_trusted_proxy_header", side_effect=Exception)
 def test_get_remote_hosts_validate_trusted_proxy_header_exception(mock_validate: mock.MagicMock, rsa_keypair, caplog):
     with override_settings(ANSIBLE_BASE_JWT_KEY=rsa_keypair.public):
         headers = {