Commit e1266e50 authored by Loic Bistuer's avatar Loic Bistuer Committed by Tim Graham
Browse files

Fixed #21015 -- Fixed MigrationLoader when importlib.import_module returns a... 

Fixed #21015 -- Fixed MigrationLoader when importlib.import_module returns a file module or an empty directory.
parent 82bbb9fe

django/db/migrations/loader.py

+7 −0
Original line number Diff line number Diff line
@@ -64,6 +64,13 @@ class MigrationLoader(object): 
                    self.unmigrated_apps.add(app_label)

                    continue

                raise

            else:

                # PY3 will happily import empty dirs as namespaces.

                if not hasattr(module, '__file__'):

                    continue

                # Module is not a package (e.g. migrations.py).

                if not hasattr(module, '__path__'):

                    continue

            self.migrated_apps.add(app_label)

            directory = os.path.dirname(module.__file__)

            # Scan for .py[c|o] files

tests/migrations/faulty_migrations/__init__.py

0 → 100644
+0 −0

Empty file added.

tests/migrations/faulty_migrations/file.py

0 → 100644
+0 −0

Empty file added.

tests/migrations/faulty_migrations/namespace/foo/__init__.py

0 → 100644
+0 −0

Empty file added.

tests/migrations/test_loader.py

+16 −0
Original line number Diff line number Diff line 
from unittest import skipIf



from django.test import TestCase

from django.test.utils import override_settings

from django.db import connection

from django.db.migrations.loader import MigrationLoader, AmbiguityError

from django.db.migrations.recorder import MigrationRecorder

from django.utils import six





class RecorderTests(TestCase):
@@ -84,3 +87,16 @@ class LoaderTests(TestCase): 
        with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.import_error"}):

            with self.assertRaises(ImportError):

                migration_loader.load_disk()



    def test_load_module_file(self):

        migration_loader = MigrationLoader(connection)



        with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.file"}):

            migration_loader.load_disk()



    @skipIf(six.PY2, "PY2 doesn't load empty dirs.")

    def test_load_empty_dir(self):

        migration_loader = MigrationLoader(connection)



        with override_settings(MIGRATION_MODULES={"migrations": "migrations.faulty_migrations.namespace"}):

            migration_loader.load_disk()