  import os
  
  from django.conf import settings, global_settings
  from django.http import HttpRequest
  from django.test import TransactionTestCase, TestCase, signals
  from django.test.utils import override_settings
  
  
 
</s> remove         import warnings
        warnings.filterwarnings('error', 'If set, MEDIA_URL must end with a slash', DeprecationWarning)

 </s> add  </s> remove         MEDIA_URL raises an DeprecationWarning error if it doesn't end in a
        slash.
 </s> add         MEDIA_URL and STATIC_URL raise an ImproperlyConfigured exception
        if they doesn't end in a slash. </s> remove         self.assertRaises(DeprecationWarning, setattr_settings,
 </s> add         self.assertRaises(ImproperlyConfigured, setattr_settings, </s> remove         self.assertRaises(DeprecationWarning, setattr_settings,
 </s> add         self.assertRaises(ImproperlyConfigured, setattr_settings,
from django.core.exceptions import ImproperlyConfigured
  import os
  
  from django.conf import settings, global_settings
from django.core.exceptions import ImproperlyConfigured
  from django.http import HttpRequest
  from django.test import TransactionTestCase, TestCase, signals
  from django.test.utils import override_settings
  
  
keep keep add keep keep keep keep keep
 Required that the MEDIA_URL and STATIC_URL settings end with a slash, per the deprecation timeline.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17845 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
tests/regressiontests/settings_tests/tests.py