summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-02-05 13:16:57 -0500
committerTim Graham <timograham@gmail.com>2018-02-05 13:29:32 -0500
commit0f0a07ac278dc2be6da81e519188f77e2a2a00cf (patch)
tree7a0014eedd18768f9796e90d062a9e27c5ab4ef2
parentaba9763b5117494ca1ef1e420397e3845ad5b262 (diff)
Refs #28814 -- Fixed migrations crash with namespace packages on Python 3.7.
Due to https://bugs.python.org/issue32303.
-rw-r--r--django/db/migrations/loader.py5
-rw-r--r--django/db/migrations/questioner.py3
2 files changed, 5 insertions, 3 deletions
diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py
index 37bef1492b..c4d26d1186 100644
--- a/django/db/migrations/loader.py
+++ b/django/db/migrations/loader.py
@@ -84,8 +84,9 @@ class MigrationLoader:
continue
raise
else:
- # PY3 will happily import empty dirs as namespaces.
- if not hasattr(module, '__file__'):
+ # 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).
diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py
index 2c34a8fd89..d482de6388 100644
--- a/django/db/migrations/questioner.py
+++ b/django/db/migrations/questioner.py
@@ -43,7 +43,8 @@ class MigrationQuestioner:
except ImportError:
return self.defaults.get("ask_initial", False)
else:
- if hasattr(migrations_module, "__file__"):
+ # getattr() needed on PY36 and older (replace with attribute access).
+ if getattr(migrations_module, "__file__", None):
filenames = os.listdir(os.path.dirname(migrations_module.__file__))
elif hasattr(migrations_module, "__path__"):
if len(migrations_module.__path__) > 1: