Ticket #6218: dj.slash.patch

django/db/models/base.py

@@ -374 +374 @@
 
     def _get_FIELD_url(self, field):
         if getattr(self, field.attname): # value is not blank
-            import urlparse
-            return urlparse.urljoin(settings.MEDIA_URL, getattr(self, field.attname)).replace('\\', '/')
+            return (settings.MEDIA_URL + getattr(self, field.attname)).replace('\\', '/')
         return ''
 
     def _get_FIELD_size(self, field):

django/conf/project_template/settings.py

@@ -38 +38 @@
 MEDIA_ROOT = ''
 
 # 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/"
+# trailing slash.
+# 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/settings.txt

@@ -683 +683 @@
 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.
+This should have a trailing slash.
 
 Good: ``"http://www.example.com/static/"``
 Bad: ``"http://www.example.com/static"``