Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Created a constant for the migrations module name.

Mostly for consistency with MODELS_MODULE_NAME; it's unlikely to change.
  • Loading branch information...
commit 2504a50cc2285b5e5f17d5403c9a79b620471b25 1 parent f00243f
Aymeric Augustin aaugustin authored
8 django/db/migrations/loader.py
View
@@ -9,6 +9,9 @@
from django.conf import settings
+MIGRATIONS_MODULE_NAME = 'migrations'
+
+
class MigrationLoader(object):
"""
Loads migration files from disk, and their status from the database.
@@ -46,7 +49,8 @@ def migrations_module(cls, app_label):
if app_label in settings.MIGRATION_MODULES:
return settings.MIGRATION_MODULES[app_label]
else:
- return '%s.migrations' % apps.get_app_config(app_label).name
+ app_package_name = apps.get_app_config(app_label).name
+ return '%s.%s' % (app_package_name, MIGRATIONS_MODULE_NAME)
def load_disk(self):
"""
@@ -64,7 +68,7 @@ def load_disk(self):
except ImportError as e:
# I hate doing this, but I don't want to squash other import errors.
# Might be better to try a directory check directly.
- if "No module named" in str(e) and "migrations" in str(e):
+ if "No module named" in str(e) and MIGRATIONS_MODULE_NAME in str(e):
self.unmigrated_apps.add(app_config.label)
continue
raise
4 django/db/migrations/questioner.py
View
@@ -6,6 +6,8 @@
from django.utils import datetime_safe
from django.utils.six.moves import input
+from .loader import MIGRATIONS_MODULE_NAME
+
class MigrationQuestioner(object):
"""
@@ -31,7 +33,7 @@ def ask_initial(self, app_label):
app_config = apps.get_app_config(app_label)
except LookupError: # It's a fake app.
return self.defaults.get("ask_initial", False)
- migrations_import_path = "%s.migrations" % app_config.name
+ migrations_import_path = "%s.%s" % (app_config.name, MIGRATIONS_MODULE_NAME)
try:
migrations_module = importlib.import_module(migrations_import_path)
except ImportError:
Please sign in to comment.
Something went wrong with that request. Please try again.