summaryrefslogtreecommitdiff
path: root/django/apps
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-31 17:55:12 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-31 18:04:54 +0100
commit1d23d766ab85301eb527629400933fd601355f1a (patch)
tree3c7b8a5ce138ee424558eeca4b18ecadcd455f77 /django/apps
parent63137a8304d4387132e749c97aad1049526f601c (diff)
downloaddjango-1d23d766ab85301eb527629400933fd601355f1a.tar.gz
Renamed AppConfig.setup to ready.
Thanks Jannis and Marc for the feedback. Fixed #21717.
Diffstat (limited to 'django/apps')
-rw-r--r--django/apps/base.py4
-rw-r--r--django/apps/registry.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/django/apps/base.py b/django/apps/base.py
index 1aa5c29fd2..47f0a57711 100644
--- a/django/apps/base.py
+++ b/django/apps/base.py
@@ -159,7 +159,7 @@ class AppConfig(object):
models_module_name = '%s.%s' % (self.name, MODELS_MODULE_NAME)
self.models_module = import_module(models_module_name)
- def setup(self):
+ def ready(self):
"""
- Override this method in subclasses to run setup code.
+ Override this method in subclasses to run code when Django starts.
"""
diff --git a/django/apps/registry.py b/django/apps/registry.py
index 3cd6d480f1..db75f999c5 100644
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@@ -105,7 +105,7 @@ class Apps(object):
self.ready = True
for app_config in self.get_app_configs():
- app_config.setup()
+ app_config.ready()
def check_ready(self):
"""