diff --git a/awx/api/views/root.py b/awx/api/views/root.py index a933da7582..9f5b142351 100644 --- a/awx/api/views/root.py +++ b/awx/api/views/root.py @@ -353,8 +353,8 @@ class ApiV2ConfigView(APIView): if 'manifest' in license_data: try: license_data = validate_entitlement_manifest(license_data['manifest']) - except Exception as e: - logger.exception('Invalid license submitted.') + except Exception: + logger.exception('Invalid license submitted. {}') return Response({"error": 'Invalid license submitted.'}, status=status.HTTP_400_BAD_REQUEST) try: diff --git a/awx/conf/migrations/_subscriptions.py b/awx/conf/migrations/_subscriptions.py index 1ec1aa1052..282bf2fb48 100644 --- a/awx/conf/migrations/_subscriptions.py +++ b/awx/conf/migrations/_subscriptions.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import logging -from django.conf import settings logger = logging.getLogger('awx.conf.settings') diff --git a/awx/main/conf.py b/awx/main/conf.py index ad677b7c0e..8be9e75e7f 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -1,7 +1,5 @@ # Python -import json import logging -import os # Django from django.utils.translation import ugettext_lazy as _ diff --git a/awx/main/tests/functional/api/test_settings.py b/awx/main/tests/functional/api/test_settings.py index 69d8b85db3..8a1f50035f 100644 --- a/awx/main/tests/functional/api/test_settings.py +++ b/awx/main/tests/functional/api/test_settings.py @@ -4,7 +4,6 @@ # Python import pytest -import os from django.conf import settings diff --git a/awx/main/utils/licensing.py b/awx/main/utils/licensing.py index d407f16379..b209df4abc 100644 --- a/awx/main/utils/licensing.py +++ b/awx/main/utils/licensing.py @@ -153,7 +153,7 @@ class Licenser(object): def validate_rh(self, user, pw): try: host = 'https://' + str(self.config.get("server", "hostname")) - except: + except Exception: logger.exception('Cannot access rhsm.conf, make sure subscription manager is installed and configured.') host = None if not host: