diff options
| author | Víðir Valberg Guðmundsson <valberg@orn.li> | 2014-06-17 17:50:31 +0200 |
|---|---|---|
| committer | Víðir Valberg Guðmundsson <valberg@orn.li> | 2014-06-17 18:21:38 +0200 |
| commit | 3a6cb9f497af4e5eb8351706056eae50a4ed3c45 (patch) | |
| tree | e0b763b3b28fcd296084c4ba5596f7cfce0d0d50 /django | |
| parent | 61d7ae31cf286277ddefaf8006597be40388d2ee (diff) | |
Fixed #22577: Python 3 broke on non-module migrations directory
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/migrations/writer.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/django/db/migrations/writer.py b/django/db/migrations/writer.py index dee867929d..71f81e9e2d 100644 --- a/django/db/migrations/writer.py +++ b/django/db/migrations/writer.py @@ -158,6 +158,12 @@ class MigrationWriter(object): # See if we can import the migrations module directly try: migrations_module = import_module(migrations_package_name) + + # Python 3 fails when the migrations directory does not have a + # __init__.py file + if not hasattr(migrations_module, '__file__'): + raise ImportError + basedir = os.path.dirname(migrations_module.__file__) except ImportError: app_config = apps.get_app_config(self.migration.app_label) |
