summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorLoic Bistuer <loic.bistuer@gmail.com>2014-05-04 21:29:49 +0700
committerLoic Bistuer <loic.bistuer@gmail.com>2014-05-05 19:29:27 +0700
commit942556df2ffd3276dc127edd3cbb9d177095d882 (patch)
tree007b2f89628d9de774a56a17f1171f88a85facc2 /django
parent3b7c66a3ac0fcaa5dd02f87888c787d2c735c1a7 (diff)
Fixed #22572 -- override_settings(ROOT_URLCONF) didn't clear urlresolvers._urlconfs.
Thanks Anubhav Joshi and Tim Graham for the reviews.
Diffstat (limited to 'django')
-rw-r--r--django/test/signals.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/test/signals.py b/django/test/signals.py
index eaa31d7494..4edf0d8752 100644
--- a/django/test/signals.py
+++ b/django/test/signals.py
@@ -129,5 +129,6 @@ def complex_setting_changed(**kwargs):
@receiver(setting_changed)
def root_urlconf_changed(**kwargs):
if kwargs['setting'] == 'ROOT_URLCONF':
- from django.core.urlresolvers import clear_url_caches
+ from django.core.urlresolvers import clear_url_caches, set_urlconf
clear_url_caches()
+ set_urlconf(None)