test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made unset_installed_apps reset the app registry state. 

Previously the _apps/models_loaded flags could remain set to False if
set_installed_apps exited with an exception, which is going to happen as
soon as we add tests for invalid values of INSTALLED_APPS.
This commit is contained in:
Aymeric Augustin 2013-12-26 18:37:04 +01:00
parent 8925aaf613
commit fec5330c79
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/apps/registry.py
View File

@ -346,7 +346,7 @@ class Apps(object):
imports safely (eg. that could lead to registering listeners twice), imports safely (eg. that could lead to registering listeners twice),
models are registered when they're imported and never removed. models are registered when they're imported and never removed.
""" """
self.stored_app_configs.append(self.app_configs) self.stored_app_configs.append((self.app_configs, self._apps_loaded, self._models_loaded))
self.app_configs = OrderedDict() self.app_configs = OrderedDict()
self.get_models.cache_clear() self.get_models.cache_clear()
self._apps_loaded = False self._apps_loaded = False
@ -358,7 +358,7 @@ class Apps(object):
""" """
Cancels a previous call to set_installed_apps(). Cancels a previous call to set_installed_apps().
""" """
self.app_configs = self.stored_app_configs.pop() self.app_configs, self._apps_loaded, self._models_loaded = self.stored_app_configs.pop()
self.get_models.cache_clear() self.get_models.cache_clear()
### DEPRECATED METHODS GO BELOW THIS LINE ### ### DEPRECATED METHODS GO BELOW THIS LINE ###