Skip to content

Commit 1e6cd32

Browse files
authored
Merge pull request #140 from dropbox/rob/fix_regression_for_as_user_admin
fix regression for as_user() and as_admin()
2 parents 556b6b3 + e30886f commit 1e6cd32

File tree

5 files changed

+32
-5
lines changed

5 files changed

+32
-5
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: python
33
python:
44
- "2.7"
55
- pypy
6-
- "3.3"
76
- "3.4"
87
- "3.5"
98
- pypy3

dropbox/dropbox.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,4 +596,12 @@ def _get_dropbox_client_with_select_header(self, select_header_name, team_member
596596

597597
new_headers = self._headers.copy() if self._headers else {}
598598
new_headers[select_header_name] = team_member_id
599-
return self.clone(headers=new_headers)
599+
return Dropbox(
600+
self._oauth2_access_token,
601+
max_retries_on_error=self._max_retries_on_error,
602+
max_retries_on_rate_limit=self._max_retries_on_rate_limit,
603+
timeout=self._timeout,
604+
user_agent=self._raw_user_agent,
605+
session=self._session,
606+
headers=new_headers,
607+
)

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
'Operating System :: OS Independent',
7070
'Programming Language :: Python',
7171
'Programming Language :: Python :: 2.7',
72-
'Programming Language :: Python :: 3.3',
7372
'Programming Language :: Python :: 3.4',
7473
'Programming Language :: Python :: 3.5',
7574
'Programming Language :: Python :: 3.6',

test/test_dropbox.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,28 @@ def test_team(self, dbxt):
144144
team_member_id = r.members[0].profile.team_member_id
145145
dbxt.as_user(team_member_id).files_list_folder('')
146146

147+
@dbx_team_from_env
148+
def test_as_user(self, dbxt):
149+
dbx_as_user = dbxt.as_user('1')
150+
self.assertIsInstance(dbx_as_user, Dropbox)
151+
152+
@dbx_team_from_env
153+
def test_as_admin(self, dbxt):
154+
dbx_as_admin = dbxt.as_admin('1')
155+
self.assertIsInstance(dbx_as_admin, Dropbox)
156+
157+
@dbx_from_env
158+
def test_clone_when_user_linked(self, dbx):
159+
new_dbx = dbx.clone()
160+
self.assertIsNot(dbx, new_dbx)
161+
self.assertIsInstance(new_dbx, dbx.__class__)
162+
163+
@dbx_team_from_env
164+
def test_clone_when_team_linked(self, dbxt):
165+
new_dbxt = dbxt.clone()
166+
self.assertIsNot(dbxt, new_dbxt)
167+
self.assertIsInstance(new_dbxt, dbxt.__class__)
168+
147169
@dbx_from_env
148170
def test_with_path_root_constructor(self, dbx):
149171
# Verify valid mode types

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
[tox]
22

3-
envlist = py{27,32,33,34,35,36,py,py3},check,lint
3+
envlist = py{27,34,35,36,py,py3},check,lint
44
skip_missing_interpreters = true
55

66
[tox:travis]
77

88
2.7 = lint
99
pypy = lint
10-
3.3 = lint
1110
3.4 = lint
1211
3.5 = lint
1312
3.6 = check, lint

0 commit comments

Comments
 (0)