From a0ffe4f23aa8e5714e2c809d16c4d1c838a095d1 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Tue, 27 Sep 2022 17:38:16 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- greyhound/core/managers.py | 4 ++-- greyhound/core/middleware.py | 10 ++++++---- indexOutOfBound/core/dbrouter.py | 4 +--- pycore/tenants/middlewares.py | 3 +-- update_sem_where/update_sem_where/core/tests/tests.py | 1 - 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/greyhound/core/managers.py b/greyhound/core/managers.py index 4ebb166..b1e730b 100644 --- a/greyhound/core/managers.py +++ b/greyhound/core/managers.py @@ -26,8 +26,8 @@ def bulk_create(self, objs, batch_size=None, ignore_conflicts=False): super().bulk_create(objs, batch_size, ignore_conflicts) - def as_manager(cls): - manager = TenantAwareManager.from_queryset(cls)() + def as_manager(self): + manager = TenantAwareManager.from_queryset(self)() manager._built_with_as_manager = True return manager diff --git a/greyhound/core/middleware.py b/greyhound/core/middleware.py index 4bcb256..738de98 100644 --- a/greyhound/core/middleware.py +++ b/greyhound/core/middleware.py @@ -16,15 +16,17 @@ def split_tenant(path): if (match := re.search(r'/(.*?)(/.*)', path)): return match.groups() elif (match := re.search(r'/(.*)', path)): - if (tenant := match.group(1)): + if tenant := match[1]: return tenant, '' raise NoTenant(f'No tenant in {path}') def tenant_exempt(tenant_name): - if not hasattr(settings, 'TENANTS_EXEMPT'): - return False - return tenant_name in settings.TENANTS_EXEMPT + return ( + tenant_name in settings.TENANTS_EXEMPT + if hasattr(settings, 'TENANTS_EXEMPT') + else False + ) def current_tenant(): diff --git a/indexOutOfBound/core/dbrouter.py b/indexOutOfBound/core/dbrouter.py index 8b545b5..93a5c23 100644 --- a/indexOutOfBound/core/dbrouter.py +++ b/indexOutOfBound/core/dbrouter.py @@ -13,6 +13,4 @@ def allow_relation(self, obj1, obj2, **hints): def allow_migrate(self, db, app_label, model_name=None, **hints): # Just migrate tenant model on default db - if model_name == 'tenant' and db != 'default': - return False - return None \ No newline at end of file + return False if model_name == 'tenant' and db != 'default' else None \ No newline at end of file diff --git a/pycore/tenants/middlewares.py b/pycore/tenants/middlewares.py index 2414481..c13b2b7 100644 --- a/pycore/tenants/middlewares.py +++ b/pycore/tenants/middlewares.py @@ -14,8 +14,7 @@ def __init__(self, get_response): def __call__(self, request): db = tenant_db_from_request(request) setattr(THREAD_LOCAL, "DB", db) - response = self.get_response(request) - return response + return self.get_response(request) def get_current_db_name(): diff --git a/update_sem_where/update_sem_where/core/tests/tests.py b/update_sem_where/update_sem_where/core/tests/tests.py index 55d61d0..63bbd9a 100644 --- a/update_sem_where/update_sem_where/core/tests/tests.py +++ b/update_sem_where/update_sem_where/core/tests/tests.py @@ -5,4 +5,3 @@ @pytest.mark.django_db def test_ok(): baker.make('core.User') - assert True