summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-02-09 14:03:41 +0000
committerAndrew Godwin <andrew@aeracode.org>2014-02-09 14:03:41 +0000
commit935e6c1dfc10808272bfda1bbda03bfee035f3dc (patch)
treeec7800e7271afe72bee21ae97895c5a916a96a1e
parent11c021336c8cb1c92be998f1a44c89a746275107 (diff)
Fixed #21868: Don't die when seeing py3 namespace packages for mig dirs
-rw-r--r--django/db/migrations/questioner.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py
index d2e63659a2..f214d243b2 100644
--- a/django/db/migrations/questioner.py
+++ b/django/db/migrations/questioner.py
@@ -39,7 +39,12 @@ class MigrationQuestioner(object):
except ImportError:
return self.defaults.get("ask_initial", False)
else:
- filenames = os.listdir(os.path.dirname(migrations_module.__file__))
+ if hasattr(migrations_module, "__file__"):
+ filenames = os.listdir(os.path.dirname(migrations_module.__file__))
+ elif hasattr(migrations_module, "__path__"):
+ if len(migrations_module.__path__) > 1:
+ return False
+ filenames = os.listdir(list(migrations_module.__path__)[0])
return not any(x.endswith(".py") for x in filenames if x != "__init__.py")
def ask_not_null_addition(self, field_name, model_name):