Ticket #15641: 15641-2.diff

tests/regressiontests/file_storage/tests.py

@@ -19 +19 @@
 from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
 from django.core.files.base import ContentFile, File
 from django.core.files.images import get_image_dimensions
-from django.core.files.storage import FileSystemStorage, get_storage_class
+from django.core.files.storage import FileSystemStorage, get_storage_class, UNUSABLE_BASE_URL
 from django.core.files.uploadedfile import UploadedFile
 from django.utils import unittest
 
@@ -88 +88 @@
 
 class FileStorageTests(unittest.TestCase):
     storage_class = FileSystemStorage
+    init_base_url = '/test_media_url/'
+    test_base_url = None
 
     def setUp(self):
         self.temp_dir = tempfile.mktemp()
         os.makedirs(self.temp_dir)
         self.storage = self.storage_class(location=self.temp_dir,
-            base_url='/test_media_url/')
+            base_url=self.init_base_url)
+        if self.test_base_url is None:
+            self.test_base_url = self.init_base_url
 
     def tearDown(self):
         shutil.rmtree(self.temp_dir)
@@ -207 +211 @@
         # should encode special chars except ~!*()'
         # like encodeURIComponent() JavaScript function do
         self.assertEqual(self.storage.url(r"""~!*()'@#$%^&*abc`+=.file"""),
-            """/test_media_url/~!*()'%40%23%24%25%5E%26*abc%60%2B%3D.file""")
+            self.test_base_url + """~!*()'%40%23%24%25%5E%26*abc%60%2B%3D.file""")
 
         # should stanslate os path separator(s) to the url path separator
         self.assertEqual(self.storage.url("""a/b\\c.file"""),
-            """/test_media_url/a/b/c.file""")
+            self.test_base_url + """a/b/c.file""")
 
         self.storage.base_url = None
         self.assertRaises(ValueError, self.storage.url, 'test.file')
@@ -265 +269 @@
         self.assertRaises(SuspiciousOperation, self.storage.exists, '..')
         self.assertRaises(SuspiciousOperation, self.storage.exists, '/etc/passwd')
 
+class NoUrlFileStorageTests(FileStorageTests):
+    init_base_url = None
+
+    def test_file_url(self):
+        """
+        File storage raises ValueError if initialized with base_url=None
+        """
+        self.assertRaises(ValueError, self.storage.url, 'test.file')
+
+class DefaultUrlFileStorageTests(FileStorageTests):
+    init_base_url = UNUSABLE_BASE_URL
+    test_base_url = '/test_media_url/'
+
+    def setUp(self):
+        self.old_media_url = settings.MEDIA_URL
+        settings.MEDIA_URL = self.test_base_url
+        super(DefaultUrlFileStorageTests, self).setUp()
+
+    def tearDown(self):
+        super(DefaultUrlFileStorageTests, self).tearDown()
+        settings.MEDIA_URL = self.old_media_url
+
 class CustomStorage(FileSystemStorage):
     def get_available_name(self, name):
         """

django/core/files/storage.py

@@ -142 +142 @@
         """
         raise NotImplementedError()
 
+UNUSABLE_BASE_URL = object()
+
 class FileSystemStorage(Storage):
     """
     Standard filesystem storage
     """
 
-    def __init__(self, location=None, base_url=None):
+    def __init__(self, location=None, base_url=UNUSABLE_BASE_URL):
         if location is None:
             location = settings.MEDIA_ROOT
-        if base_url is None:
+        if base_url is UNUSABLE_BASE_URL:
             base_url = settings.MEDIA_URL
         self.location = os.path.abspath(location)
         self.base_url = base_url