mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-28 16:16:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #18042 -- Advanced deprecation warnings.

Browse Source 
Thanks Ramiro for the patch.
This commit is contained in:
Aymeric Augustin
2012-05-03 15:27:01 +02:00
parent 227cec686e
commit e84f79f051
27 changed files with 75 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/regressiontests/settings_tests/tests.py
View File

@@ -1,4 +1,5 @@
import os
import warnings
from django.conf import settings, global_settings
from django.core.exceptions import ImproperlyConfigured
@@ -274,10 +275,14 @@ class EnvironmentVariableTest(TestCase):
Ensures proper settings file is used in setup_environ if
DJANGO_SETTINGS_MODULE is set in the environment.
"""
# Decide what to do with these tests when setup_environ() gets removed in Django 1.6
def setUp(self):
self.original_value = os.environ.get('DJANGO_SETTINGS_MODULE')
self.save_warnings_state()
warnings.filterwarnings('ignore', category=DeprecationWarning, module='django.core.management')
def tearDown(self):
self.restore_warnings_state()
if self.original_value:
os.environ['DJANGO_SETTINGS_MODULE'] = self.original_value
elif 'DJANGO_SETTINGS_MODULE' in os.environ: