Dropbox: Add support to timeout

AUTHORS

@@ -32,6 +32,7 @@ By order of apparition, thanks:
     * Stanislav Kaledin (Bug fixes in SFTPStorage)
     * Filip Vavera (Google Cloud MIME types support)
     * Max Malysh (Dropbox large file support)
+    * Lucas Rangel Cezimbra (patches)
 
 Extra thanks to Marty for adding this in Django,
 you can buy his very interesting book (Pro Django).

docs/backends/dropbox.rst

@@ -20,8 +20,15 @@ To use DropBoxStorage set::
 ``DROPBOX_OAUTH2_TOKEN``
     Your DropBox token, if you haven't follow this `guide step`_.
 
-``DROPBOX_ROOT_PATH``
+``DROPBOX_ROOT_PATH`` (optional)
     Allow to jail your storage to a defined directory.
 
+    Default: ``/``
+
+``DROPBOX_TIMEOUT`` (optional)
+    Timeout in seconds. After timeout the connection will be closed. If ``None``, client will wait forever. 
+
+    Dropbox default: ``30`` seconds
+
 .. _`guide step`: https://www.dropbox.com/developers/documentation/python#tutorial
 .. _`Dropbox SDK for Python`: https://www.dropbox.com/developers/documentation/python#tutorial

storages/backends/dropbox.py

@@ -53,13 +53,17 @@ class DropBoxStorage(Storage):
 
     CHUNK_SIZE = 4 * 1024 * 1024
 
-    def __init__(self, oauth2_access_token=None, root_path=None):
+    def __init__(self, oauth2_access_token=None, root_path=None, timeout=None):
         oauth2_access_token = oauth2_access_token or setting('DROPBOX_OAUTH2_TOKEN')
         self.root_path = root_path or setting('DROPBOX_ROOT_PATH', '/')
+        timeout = timeout or setting('DROPBOX_TIMEOUT')
         if oauth2_access_token is None:
             raise ImproperlyConfigured("You must configure a token auth at"
                                        "'settings.DROPBOX_OAUTH2_TOKEN'.")
-        self.client = Dropbox(oauth2_access_token)
+        if timeout:
+            self.client = Dropbox(oauth2_access_token, timeout)
+        else:
+            self.client = Dropbox(oauth2_access_token)
 
     def _full_path(self, name):
         if name == '/':

tests/test_dropbox.py

@@ -150,6 +150,23 @@ def test_formats(self, *args):
         self.assertEqual(files, self.storage._full_path('..'))
         self.assertEqual(files, self.storage._full_path('../..'))
 
+    @mock.patch('storages.backends.dropbox.Dropbox')
+    def test_timeout_config(self, Dropbox):
+        token = 'abc'
+        timeout = 60
+
+        with self.settings(DROPBOX_OAUTH2_TOKEN=token, DROPBOX_TIMEOUT=timeout):
+            dropbox.DropBoxStorage()
+            Dropbox.assert_called_with(token, timeout)
+
+        with self.settings(DROPBOX_OAUTH2_TOKEN=token):
+            dropbox.DropBoxStorage(timeout=timeout)
+            Dropbox.assert_called_with(token, timeout)
+
+        with self.settings(DROPBOX_OAUTH2_TOKEN=token):
+            dropbox.DropBoxStorage()
+            Dropbox.assert_called_with(token)
+
 
 class DropBoxFileTest(TestCase):
     def setUp(self, *args):