From 3103fc40b77ace49ff3b2e9727919e15c804f7e2 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Tue, 28 Feb 2023 01:29:08 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- cli/cmd_api.py | 2 +- cli/cmd_celery.py | 2 +- cli/cmd_command.py | 2 +- cli/cmd_db.py | 2 +- config/static_config.py | 19 +++++++++++-------- config/tasks/base.py | 6 +++--- facilities/databases/DBMixins.py | 4 +--- facilities/mimes.py | 6 +----- models/users.py | 2 +- 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/cli/cmd_api.py b/cli/cmd_api.py index 573893c..0e6c7cf 100644 --- a/cli/cmd_api.py +++ b/cli/cmd_api.py @@ -30,7 +30,7 @@ def make_api(api_name: str, model): f"class {api_name.capitalize()}View(Resource):\n" f" pass") - with open(f'api/__init__.py', 'a+') as f: + with open('api/__init__.py', 'a+') as f: f.write( f'from api.{api_name} import {api_name.capitalize()}View\n') f.write( diff --git a/cli/cmd_celery.py b/cli/cmd_celery.py index 37a0b8c..c3163d4 100644 --- a/cli/cmd_celery.py +++ b/cli/cmd_celery.py @@ -25,7 +25,7 @@ def celery(queues, logfile, concurrency, worker_max_tasks_per_child): if queues: config.update(queues=queues.split(',')) - logger.info("worker is listening to queues: {}".format(queues)) + logger.info(f"worker is listening to queues: {queues}") else: logger.info("worker is listening to ALL queues") diff --git a/cli/cmd_command.py b/cli/cmd_command.py index eb1278e..494e91c 100644 --- a/cli/cmd_command.py +++ b/cli/cmd_command.py @@ -28,7 +28,7 @@ def {command_name}(): pass ''') - with open(f'cli/__init__.py', 'a+') as f: + with open('cli/__init__.py', 'a+') as f: f.write( f'from .cmd_{command_name} import *\n') diff --git a/cli/cmd_db.py b/cli/cmd_db.py index 42de88c..0638789 100644 --- a/cli/cmd_db.py +++ b/cli/cmd_db.py @@ -26,7 +26,7 @@ class {model_name.capitalize()}(Model, IDMixin): pass ''') - with open(f'models/__init__.py', 'a+') as f: + with open('models/__init__.py', 'a+') as f: f.write( f'from models.{model_name} import {model_name.capitalize()}\n') diff --git a/config/static_config.py b/config/static_config.py index c25f01a..fe241af 100644 --- a/config/static_config.py +++ b/config/static_config.py @@ -24,16 +24,18 @@ -class Config(): + + +class Config: # STATIC CONFIG-------------------------------------------- - REDIS_DOMAIN = 'redis://{}:6379'.format(REDIS_HOST) - AUTH_REDIS_URL = 'redis://{}:6379/0'.format(REDIS_HOST) + REDIS_DOMAIN = f'redis://{REDIS_HOST}:6379' + AUTH_REDIS_URL = f'redis://{REDIS_HOST}:6379/0' - CELERY_BROKER_URL = '{}/{}'.format(REDIS_DOMAIN, 1) + CELERY_BROKER_URL = f'{REDIS_DOMAIN}/1' - CELERY_RESULT_BACKEND = '{}/{}'.format(REDIS_DOMAIN, 1) + CELERY_RESULT_BACKEND = f'{REDIS_DOMAIN}/1' CELERY_WORKER_CONFIG = { 'broker': CELERY_BROKER_URL, @@ -43,7 +45,7 @@ class Config(): } - REDBEAT_REDIS_URL = '{}/{}'.format(REDIS_DOMAIN, 3) + REDBEAT_REDIS_URL = f'{REDIS_DOMAIN}/3' REDBEAT_KEY_PREFIX = 'redbeat' REDBEAT_LOCK_KEY = 'redbeat:lock' # REDBEAT_LOCK_TIMEOUT = 2 @@ -98,11 +100,11 @@ class Config(): SOCKETIO_MESSAGE_QUEUE = 'redis://' CACHE_CONFIG = { - 'CACHE_TYPE' : 'redis', + 'CACHE_TYPE': 'redis', 'CACHE_KEY_PREFIX': 'fcache_', 'CACHE_REDIS_HOST': 'localhost', 'CACHE_REDIS_PORT': '6379', - 'CACHE_REDIS_URL' : '{}/{}'.format(REDIS_DOMAIN, 2) + 'CACHE_REDIS_URL': f'{REDIS_DOMAIN}/2', } IS_AUTH_ENABLED = True @@ -167,6 +169,7 @@ class Config(): } + class ProductionConfig(Config): DEBUG = False diff --git a/config/tasks/base.py b/config/tasks/base.py index 5c7cbfc..f80bd47 100644 --- a/config/tasks/base.py +++ b/config/tasks/base.py @@ -13,12 +13,12 @@ class BaseTask(Task): def on_failure(self, exc, task_id, args, kwargs, einfo): logger.exception(str(einfo)) - logger.debug("Task_id {} failed, Arguments are {}".format(task_id, args)) + logger.debug(f"Task_id {task_id} failed, Arguments are {args}") if current_config.IS_ERROR_MAIL_ENABLED: # send error mail - mail_subject = "[App Celery] for task_id {}, {}".format(task_id, str(exc)) + mail_subject = f"[App Celery] for task_id {task_id}, {str(exc)}" - mail_body = "\nargs: {} \nkwargs: {}\n\n\n {}".format(args, kwargs, (str(einfo))) + mail_body = f"\nargs: {args} \nkwargs: {kwargs}\n\n\n {str(einfo)}" msg = Message(subject=mail_subject, body=mail_body, sender=current_config.DEFAULT_MAIL_SENDER, recipients=current_config.ADMINS) mail.send(msg) diff --git a/facilities/databases/DBMixins.py b/facilities/databases/DBMixins.py index 62dab99..3bfff0f 100644 --- a/facilities/databases/DBMixins.py +++ b/facilities/databases/DBMixins.py @@ -62,9 +62,7 @@ def __ne__(self, other): Checks the inequality of two `UserMixin` objects using `get_id`. """ equal = self.__eq__(other) - if equal is NotImplemented: - return NotImplemented - return not equal + return NotImplemented if equal is NotImplemented else not equal class AnonymousUserMixin: diff --git a/facilities/mimes.py b/facilities/mimes.py index 9aaa33f..3b71621 100755 --- a/facilities/mimes.py +++ b/facilities/mimes.py @@ -105,8 +105,4 @@ def get_mimes(extension=None): def get_extensions(mime_type=None): """Returns possible extensions for the given mime_type""" - exts = [] - for ext in _mime_types: - if mime_type in _mime_types[ext]: - exts.append(ext) - return exts + return [ext for ext in _mime_types if mime_type in _mime_types[ext]] diff --git a/models/users.py b/models/users.py index c10d0f6..dec5583 100644 --- a/models/users.py +++ b/models/users.py @@ -15,7 +15,7 @@ class User(Model, IDMixin): is_active: Column = Column(Boolean, default = True, server_default = 'true') def __repr__(self): - return ''.format(self.username) + return f'' # Using Praetorian specific features ---------------------- @property