From 16d120862fb4e01ea7e0a8e5700592e8f44cb1f5 Mon Sep 17 00:00:00 2001 From: Peichao Zhang Date: Fri, 22 Jun 2018 16:19:17 -0700 Subject: [PATCH 1/3] Add route version to transport code on client side. --- dropbox/dropbox.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dropbox/dropbox.py b/dropbox/dropbox.py index 002300d6..3233b1a8 100644 --- a/dropbox/dropbox.py +++ b/dropbox/dropbox.py @@ -249,6 +249,8 @@ def request(self, """ host = route.attrs['host'] or 'api' route_name = namespace + '/' + route.name + if route.version > 1: + route_name += '_v{}'.format(route.version) route_style = route.attrs['style'] or 'rpc' serialized_arg = stone_serializers.json_encode(route.arg_type, request_arg) From 128f49ce613587679127a549282bc313e5198f64 Mon Sep 17 00:00:00 2001 From: Peichao Zhang Date: Fri, 22 Jun 2018 16:19:33 -0700 Subject: [PATCH 2/3] Added tests for invoking versioned routes. --- test/test_dropbox.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/test_dropbox.py b/test/test_dropbox.py index 9a409463..f2bbf7b5 100644 --- a/test/test_dropbox.py +++ b/test/test_dropbox.py @@ -32,6 +32,7 @@ PathRootError, ) from dropbox.files import ( + DeleteResult, ListFolderError, ) from dropbox.common import ( @@ -191,6 +192,18 @@ def test_path_root_err(self, dbx): dbxpr.files_list_folder('') self.assertTrue(cm.exception.error.is_invalid_root()) + @dbx_from_env + def test_versioned_route(self, dbx): + # Upload a test file + path = '/test.txt' + test_contents = DUMMY_PAYLOAD + dbx.files_upload(DUMMY_PAYLOAD, path) + + # Delete the file with v2 route + resp = dbx.files_delete_v2(path) + # Verify response type is of v2 route + self.assertIsInstance(resp, DeleteResult) + class TestDropboxTeam(unittest.TestCase): @dbx_team_from_env def test_team(self, dbxt): From dd5436a96f140f9905dca501fac80ccc6583d22f Mon Sep 17 00:00:00 2001 From: Peichao Zhang Date: Mon, 25 Jun 2018 20:47:01 -0700 Subject: [PATCH 3/3] Fixed lint tests --- test/test_dropbox.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_dropbox.py b/test/test_dropbox.py index f2bbf7b5..7060ffb7 100644 --- a/test/test_dropbox.py +++ b/test/test_dropbox.py @@ -196,7 +196,6 @@ def test_path_root_err(self, dbx): def test_versioned_route(self, dbx): # Upload a test file path = '/test.txt' - test_contents = DUMMY_PAYLOAD dbx.files_upload(DUMMY_PAYLOAD, path) # Delete the file with v2 route