Sourcery refactored main branch

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
 

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():

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
+        return False if model_name == 'tenant' and db != 'default' else None

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():

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