Browse Source

[backend][filesystem] Removes result_fspath setting: Use URLs

Ask Solem 9 years ago
parent
commit
0c8c4bcc6d

+ 0 - 2
celery/app/defaults.py

@@ -187,8 +187,6 @@ NAMESPACES = Namespace(
         ),
         persistent=Option(None, type='bool'),
         serializer=Option('json'),
-
-        fspath=Option(None),
     ),
     riak=Namespace(
         __old__=old_ns('celery_riak'),

+ 3 - 5
celery/backends/filesystem.py

@@ -61,13 +61,11 @@ class FilesystemBackend(KeyValueStoreBackend):
         self._do_directory_test(b'.fs-backend-' + uuid().encode(encoding))
 
     def _find_path(self, url):
-        if url is not None and url.startswith('file:///'):
-            return url[7:]
-        path = self.app.conf.result_fspath
-        if not path:
+        if not url:
             raise ImproperlyConfigured(
                 'You need to configure a path for the Filesystem backend')
-        return path
+        if url is not None and url.startswith('file:///'):
+            return url[7:]
 
     def _do_directory_test(self, key):
         try:

+ 0 - 5
celery/tests/backends/test_filesystem.py

@@ -28,11 +28,6 @@ class test_FilesystemBackend(AppCase):
         with self.assertRaises(ImproperlyConfigured):
             FilesystemBackend(app=self.app)
 
-    def test_a_path_in_app_conf(self):
-        self.app.conf.result_fspath = self.url[7:]
-        tb = FilesystemBackend(app=self.app)
-        self.assertEqual(tb.path, self.path)
-
     def test_a_path_in_url(self):
         tb = FilesystemBackend(app=self.app, url=self.url)
         self.assertEqual(tb.path, self.path)