Ticket #6218: ticket-6218.2.patch

django/conf/__init__.py

@@ -59 +59 @@
         return bool(self._wrapped)
     configured = property(configured)
 
-class Settings(object):
+class BaseSettings(object):
+    """
+        Common logic for settings wether set by a module or by the user.
+    """
+    def __setattr__(self, name, value):
+        #Protecting people from themselves if they set MEDIA_URL to a value that
+        #doesn't end in a trailing slash
+        if name == "MEDIA_URL" and value and value[-1] != '/':
+            value = "%s/" % value
+        object.__setattr__(self, name, value)
+
+class Settings(BaseSettings):
     def __init__(self, settings_module):
         # update this dict from global settings (but only for ALL_CAPS settings)
         for setting in dir(global_settings):
@@ -108 +119 @@
             os.environ['TZ'] = self.TIME_ZONE
             time.tzset()
 
-class UserSettingsHolder(object):
+class UserSettingsHolder(BaseSettings):
     """
     Holder for user configured settings.
     """

django/conf/project_template/settings.py

@@ -49 +49 @@
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
+# Examples: "http://media.lawrence.com/", "http://example.com/media/"
 MEDIA_URL = ''
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a

docs/ref/settings.txt

@@ -1072 +1072 @@
 Default: ``''`` (Empty string)
 
 URL that handles the media served from ``MEDIA_ROOT``.
-Example: ``"http://media.lawrence.com"``
+Example: ``"http://media.lawrence.com/"``
 
-Note that this should have a trailing slash if it has a path component.
-
-Good: ``"http://www.example.com/static/"``
-Bad: ``"http://www.example.com/static"``
+Note that a trailing slash will be added if this is set to a non-empty value.
 
 .. setting:: MIDDLEWARE_CLASSES
 

tests/regressiontests/settings_tests/tests.py

@@ -1 +1 @@
 import unittest
-from django.conf import settings
+from django.conf import settings, UserSettingsHolder, global_settings
 
 class SettingsTests(unittest.TestCase):
 
@@ -15 +15 @@
 
     def test_settings_delete_wrapped(self):
         self.assertRaises(TypeError, delattr, settings, '_wrapped')
+
+    def test_settings_media_url_trailing_slash(self):
+        """
+            settings.MEDIA_URL should always end with a slash if it's not blank
+        """
+        settings.MEDIA_URL = ''
+        self.assertEqual('', settings.MEDIA_URL)
+        del settings.MEDIA_URL
+
+        settings.MEDIA_URL = '/foo/'
+        self.assertEqual('/foo/', settings.MEDIA_URL)
+        del settings.MEDIA_URL
+
+        settings.MEDIA_URL = '/foo'
+        self.assertEqual('/foo/', settings.MEDIA_URL)
+        del settings.MEDIA_URL
+
+        settings.MEDIA_URL = 'http://media.foo.com'
+        self.assertEqual('http://media.foo.com/', settings.MEDIA_URL)
+        del settings.MEDIA_URL
+
+        settings.MEDIA_URL = 'http://media.foo.com/'
+        self.assertEqual('http://media.foo.com/', settings.MEDIA_URL)
+        del settings.MEDIA_URL
+
+        #If someone does something stupid, presume they know what they're doing
+        settings.MEDIA_URL = 'http://media.foo.com/stupid//'
+        self.assertEqual('http://media.foo.com/stupid//', settings.MEDIA_URL)
+
+        s = UserSettingsHolder(global_settings)
+        s.MEDIA_URL = ''
+        self.assertEqual('', s.MEDIA_URL)
+
+        s = UserSettingsHolder(global_settings)
+        s.MEDIA_URL = '/foo/'
+        self.assertEqual('/foo/', s.MEDIA_URL)
+
+        s = UserSettingsHolder(global_settings)
+        s.MEDIA_URL = '/foo'
+        self.assertEqual('/foo/', s.MEDIA_URL)
+
+        s = UserSettingsHolder(global_settings)
+        s.MEDIA_URL = 'http://media.foo.com/'
+        self.assertEqual('http://media.foo.com/', s.MEDIA_URL)
+
+        s = UserSettingsHolder(global_settings)
+        s.MEDIA_URL = 'http://media.foo.com'
+        self.assertEqual('http://media.foo.com/', s.MEDIA_URL)
+
+        s = UserSettingsHolder(global_settings)
+        s.MEDIA_URL = 'http://media.foo.com/stupid//'
+        self.assertEqual('http://media.foo.com/stupid//', s.MEDIA_URL)
+ No newline at end of file