From 568faccff6714b4f6dee2734cb0adc36a82e8c59 Mon Sep 17 00:00:00 2001 From: jacklinke Date: Mon, 18 Nov 2024 11:33:55 -0500 Subject: [PATCH] Minor improvements to remove print statements --- src/django_tenant_options/app_settings.py | 11 +++++++---- .../management/commands/listoptions.py | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/django_tenant_options/app_settings.py b/src/django_tenant_options/app_settings.py index 40c2dc1..1ccf9bf 100644 --- a/src/django_tenant_options/app_settings.py +++ b/src/django_tenant_options/app_settings.py @@ -10,17 +10,20 @@ } """ +import logging from django.core.exceptions import ImproperlyConfigured +logger = logging.getLogger(__name__) + try: from django.conf import settings -except ImproperlyConfigured: - print("**** ImproperlyConfigured") +except ImproperlyConfigured as e: + logger.error("Settings could not be imported: %s", e) settings = None # pylint: disable=C0103 -except ImportError: - print("**** ImportError") +except ImportError as e: + logger.error("Django could not be imported. Settings cannot be loaded: %s", e) settings = None # pylint: disable=C0103 from django.db import models diff --git a/src/django_tenant_options/management/commands/listoptions.py b/src/django_tenant_options/management/commands/listoptions.py index 974f2a6..09f9b0a 100644 --- a/src/django_tenant_options/management/commands/listoptions.py +++ b/src/django_tenant_options/management/commands/listoptions.py @@ -21,7 +21,7 @@ def listoptions(self): model_subclasses = all_option_subclasses() if not model_subclasses: - print("No options found in the project.") + self.stdout.write(self.style.NOTICE("No options found in the project.")) return for ModelClass in all_option_subclasses(): # pylint: disable=C0103 @@ -29,10 +29,10 @@ def listoptions(self): self.stdout.write(self.style.WARNING(" Options:")) for option in ModelClass.objects.active(): if option.tenant is not None: - print(f" - {option.name} (Tenant: {option.tenant})") + self.stdout.write(f" - {option.name} (Tenant: {option.tenant})") else: - print(f" - {option.name}") - print() + self.stdout.write(f" - {option.name}") + self.stdout.write("") except Exception as e: # pylint: disable=W0703 logger.error("Error: %s", e)