mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Reverted "Fixed #30300 -- Allowed migrations to be loaded from directories without __init__.py file."

Browse Source 
This reverts commit 3cd3bebe89.
This commit is contained in:
Tim Graham
2020-07-22 01:04:06 -04:00
committed by GitHub
parent 3f2821af6b
commit ff55adbd0d
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/migrations/loader.py
View File

@@ -88,6 +88,11 @@ class MigrationLoader:
continue
raise
else:
# Empty directories are namespaces.
# getattr() needed on PY36 and older (replace w/attribute access).
if getattr(module, '__file__', None) is None:
self.unmigrated_apps.add(app_config.label)
continue
# Module is not a package (e.g. migrations.py).
if not hasattr(module, '__path__'):
self.unmigrated_apps.add(app_config.label)
@@ -95,14 +100,11 @@ class MigrationLoader:
# Force a reload if it's already loaded (tests need this)
if was_loaded:
reload(module)
self.migrated_apps.add(app_config.label)
migration_names = {
name for _, name, is_pkg in pkgutil.iter_modules(module.__path__)
if not is_pkg and name[0] not in '_~'
}
if migration_names or self.ignore_no_migrations:
self.migrated_apps.add(app_config.label)
else:
self.unmigrated_apps.add(app_config.label)
# Load migrations
for migration_name in migration_names:
migration_path = '%s.%s' % (module_name, migration_name)