From c14c85023eee7745cd798126ccd112e41b0bd172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 14 Aug 2018 08:16:58 +0200 Subject: [PATCH] multitenant: always sort tenants (#25673) --- hobo/multitenant/management/commands/__init__.py | 1 - hobo/multitenant/management/commands/migrate_schemas.py | 3 +-- hobo/multitenant/middleware.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hobo/multitenant/management/commands/__init__.py b/hobo/multitenant/management/commands/__init__.py index c44ae08..c2822f2 100644 --- a/hobo/multitenant/management/commands/__init__.py +++ b/hobo/multitenant/management/commands/__init__.py @@ -92,7 +92,6 @@ class InteractiveTenantOption(object): def get_tenant_from_options_or_interactive(self, **options): all_tenants = list(TenantMiddleware.get_tenants()) - all_tenants.sort(key=lambda x: x.domain_url) if not all_tenants: raise CommandError("""There are no tenants in the system. diff --git a/hobo/multitenant/management/commands/migrate_schemas.py b/hobo/multitenant/management/commands/migrate_schemas.py index 9413822..f1b9a63 100644 --- a/hobo/multitenant/management/commands/migrate_schemas.py +++ b/hobo/multitenant/management/commands/migrate_schemas.py @@ -45,8 +45,7 @@ class MigrateSchemasCommand(SyncCommon): else: self.run_migrations(self.schema_name, settings.TENANT_APPS) else: - all_tenants = TenantMiddleware.get_tenants() - for tenant in sorted(all_tenants, key=lambda x: x.schema_name): + for tenant in TenantMiddleware.get_tenants(): self.run_migrations(tenant.schema_name, settings.TENANT_APPS) def run_migrations(self, schema_name, included_apps): diff --git a/hobo/multitenant/middleware.py b/hobo/multitenant/middleware.py index a855545..f225dd9 100644 --- a/hobo/multitenant/middleware.py +++ b/hobo/multitenant/middleware.py @@ -46,7 +46,7 @@ class TenantMiddleware(object): @classmethod def get_tenants(cls): self = cls() - for path in glob.glob(os.path.join(cls.base(), '*')): + for path in sorted(glob.glob(os.path.join(cls.base(), '*'))): hostname = os.path.basename(path) if hostname.endswith('.invalid'): continue -- 2.18.0