Skip to content

Commit 4ed8237

Browse files
authored
Automated Spec Update (#368)
4c2256e55c765e545d478018f3eb8f823de52925 Change Notes: files Namespace - Update list_folder route to include auth - Update list_folder/continue route to include auth - Update list_folder/get_latest_cursor route to include auth sharing_files Namespace - Update Comments - Add UpdateFileMemberArgs struct - Remove change_file_member_access route - Remove ChangeFileMemberAccessArgs and UpdateFileMemberArgs structs 973bd9fef7e3eea8de85bd20494333bbffe17999 Co-authored-by: DropboxBot <DropboxBot@users.noreply.github.com>
1 parent 22561b7 commit 4ed8237

File tree

4 files changed

+52
-120
lines changed

4 files changed

+52
-120
lines changed

dropbox/base.py

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3895,39 +3895,6 @@ def sharing_add_folder_member(self,
38953895
)
38963896
return None
38973897

3898-
def sharing_change_file_member_access(self,
3899-
file,
3900-
member,
3901-
access_level):
3902-
"""
3903-
Identical to update_file_member but with less information returned.
3904-
3905-
:param str file: File for which we are changing a member's access.
3906-
:param member: The member whose access we are changing.
3907-
:type member: :class:`dropbox.sharing.MemberSelector`
3908-
:param access_level: The new access level for the member.
3909-
:type access_level: :class:`dropbox.sharing.AccessLevel`
3910-
:rtype: :class:`dropbox.sharing.FileMemberActionResult`
3911-
:raises: :class:`.exceptions.ApiError`
3912-
3913-
If this raises, ApiError will contain:
3914-
:class:`dropbox.sharing.FileMemberActionError`
3915-
"""
3916-
warnings.warn(
3917-
'change_file_member_access is deprecated. Use update_file_member.',
3918-
DeprecationWarning,
3919-
)
3920-
arg = sharing.ChangeFileMemberAccessArgs(file,
3921-
member,
3922-
access_level)
3923-
r = self.request(
3924-
sharing.change_file_member_access,
3925-
'sharing',
3926-
arg,
3927-
None,
3928-
)
3929-
return r
3930-
39313898
def sharing_check_job_status(self,
39323899
async_job_id):
39333900
"""
@@ -5024,6 +4991,11 @@ def sharing_update_file_member(self,
50244991
"""
50254992
Changes a member's access on a shared file.
50264993
4994+
:param str file: File for which we are changing a member's access.
4995+
:param member: The member whose access we are changing.
4996+
:type member: :class:`dropbox.sharing.MemberSelector`
4997+
:param access_level: The new access level for the member.
4998+
:type access_level: :class:`dropbox.sharing.AccessLevel`
50274999
:rtype: :class:`dropbox.sharing.MemberAccessLevelResult`
50285000
:raises: :class:`.exceptions.ApiError`
50295001

dropbox/files.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12781,7 +12781,7 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
1278112781
ListFolderArg_validator,
1278212782
ListFolderResult_validator,
1278312783
ListFolderError_validator,
12784-
{'auth': u'user',
12784+
{'auth': u'app, user',
1278512785
'host': u'api',
1278612786
'style': u'rpc'},
1278712787
)
@@ -12792,7 +12792,7 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
1279212792
ListFolderContinueArg_validator,
1279312793
ListFolderResult_validator,
1279412794
ListFolderContinueError_validator,
12795-
{'auth': u'user',
12795+
{'auth': u'app, user',
1279612796
'host': u'api',
1279712797
'style': u'rpc'},
1279812798
)
@@ -12803,7 +12803,7 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
1280312803
ListFolderArg_validator,
1280412804
ListFolderGetLatestCursorResult_validator,
1280512805
ListFolderError_validator,
12806-
{'auth': u'user',
12806+
{'auth': u'app, user',
1280712807
'host': u'api',
1280812808
'style': u'rpc'},
1280912809
)

dropbox/sharing.py

Lines changed: 43 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,55 +1030,6 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
10301030

10311031
AudienceRestrictingSharedFolder_validator = bv.Struct(AudienceRestrictingSharedFolder)
10321032

1033-
class ChangeFileMemberAccessArgs(bb.Struct):
1034-
"""
1035-
Arguments for
1036-
:meth:`dropbox.dropbox_client.Dropbox.sharing_change_file_member_access`.
1037-
1038-
:ivar sharing.ChangeFileMemberAccessArgs.file: File for which we are
1039-
changing a member's access.
1040-
:ivar sharing.ChangeFileMemberAccessArgs.member: The member whose access we
1041-
are changing.
1042-
:ivar sharing.ChangeFileMemberAccessArgs.access_level: The new access level
1043-
for the member.
1044-
"""
1045-
1046-
__slots__ = [
1047-
'_file_value',
1048-
'_member_value',
1049-
'_access_level_value',
1050-
]
1051-
1052-
_has_required_fields = True
1053-
1054-
def __init__(self,
1055-
file=None,
1056-
member=None,
1057-
access_level=None):
1058-
self._file_value = bb.NOT_SET
1059-
self._member_value = bb.NOT_SET
1060-
self._access_level_value = bb.NOT_SET
1061-
if file is not None:
1062-
self.file = file
1063-
if member is not None:
1064-
self.member = member
1065-
if access_level is not None:
1066-
self.access_level = access_level
1067-
1068-
# Instance attribute type: str (validator is set below)
1069-
file = bb.Attribute("file")
1070-
1071-
# Instance attribute type: MemberSelector (validator is set below)
1072-
member = bb.Attribute("member", user_defined=True)
1073-
1074-
# Instance attribute type: AccessLevel (validator is set below)
1075-
access_level = bb.Attribute("access_level", user_defined=True)
1076-
1077-
def _process_custom_annotations(self, annotation_type, field_path, processor):
1078-
super(ChangeFileMemberAccessArgs, self)._process_custom_annotations(annotation_type, field_path, processor)
1079-
1080-
ChangeFileMemberAccessArgs_validator = bv.Struct(ChangeFileMemberAccessArgs)
1081-
10821033
class LinkMetadata(bb.Struct):
10831034
"""
10841035
Metadata for a shared link. This can be either a :class:`PathLinkMetadata`
@@ -2229,8 +2180,7 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
22292180
class FileMemberActionResult(bb.Struct):
22302181
"""
22312182
Per-member result for
2232-
:meth:`dropbox.dropbox_client.Dropbox.sharing_add_file_member` or
2233-
:meth:`dropbox.dropbox_client.Dropbox.sharing_change_file_member_access`.
2183+
:meth:`dropbox.dropbox_client.Dropbox.sharing_add_file_member`.
22342184
22352185
:ivar sharing.FileMemberActionResult.member: One of specified input members.
22362186
:ivar sharing.FileMemberActionResult.result: The outcome of the action on
@@ -9907,13 +9857,23 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
99079857

99089858
UnshareFolderError_validator = bv.Union(UnshareFolderError)
99099859

9910-
class UpdateFileMemberArgs(ChangeFileMemberAccessArgs):
9860+
class UpdateFileMemberArgs(bb.Struct):
99119861
"""
99129862
Arguments for
99139863
:meth:`dropbox.dropbox_client.Dropbox.sharing_update_file_member`.
9864+
9865+
:ivar sharing.UpdateFileMemberArgs.file: File for which we are changing a
9866+
member's access.
9867+
:ivar sharing.UpdateFileMemberArgs.member: The member whose access we are
9868+
changing.
9869+
:ivar sharing.UpdateFileMemberArgs.access_level: The new access level for
9870+
the member.
99149871
"""
99159872

99169873
__slots__ = [
9874+
'_file_value',
9875+
'_member_value',
9876+
'_access_level_value',
99179877
]
99189878

99199879
_has_required_fields = True
@@ -9922,9 +9882,24 @@ def __init__(self,
99229882
file=None,
99239883
member=None,
99249884
access_level=None):
9925-
super(UpdateFileMemberArgs, self).__init__(file,
9926-
member,
9927-
access_level)
9885+
self._file_value = bb.NOT_SET
9886+
self._member_value = bb.NOT_SET
9887+
self._access_level_value = bb.NOT_SET
9888+
if file is not None:
9889+
self.file = file
9890+
if member is not None:
9891+
self.member = member
9892+
if access_level is not None:
9893+
self.access_level = access_level
9894+
9895+
# Instance attribute type: str (validator is set below)
9896+
file = bb.Attribute("file")
9897+
9898+
# Instance attribute type: MemberSelector (validator is set below)
9899+
member = bb.Attribute("member", user_defined=True)
9900+
9901+
# Instance attribute type: AccessLevel (validator is set below)
9902+
access_level = bb.Attribute("access_level", user_defined=True)
99289903

99299904
def _process_custom_annotations(self, annotation_type, field_path, processor):
99309905
super(UpdateFileMemberArgs, self)._process_custom_annotations(annotation_type, field_path, processor)
@@ -10838,20 +10813,6 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
1083810813
('audience', AudienceRestrictingSharedFolder.audience.validator),
1083910814
]
1084010815

10841-
ChangeFileMemberAccessArgs.file.validator = PathOrId_validator
10842-
ChangeFileMemberAccessArgs.member.validator = MemberSelector_validator
10843-
ChangeFileMemberAccessArgs.access_level.validator = AccessLevel_validator
10844-
ChangeFileMemberAccessArgs._all_field_names_ = set([
10845-
'file',
10846-
'member',
10847-
'access_level',
10848-
])
10849-
ChangeFileMemberAccessArgs._all_fields_ = [
10850-
('file', ChangeFileMemberAccessArgs.file.validator),
10851-
('member', ChangeFileMemberAccessArgs.member.validator),
10852-
('access_level', ChangeFileMemberAccessArgs.access_level.validator),
10853-
]
10854-
1085510816
LinkMetadata.url.validator = bv.String()
1085610817
LinkMetadata.visibility.validator = Visibility_validator
1085710818
LinkMetadata.expires.validator = bv.Nullable(common.DropboxTimestamp_validator)
@@ -12784,8 +12745,19 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
1278412745
UnshareFolderError.too_many_files = UnshareFolderError('too_many_files')
1278512746
UnshareFolderError.other = UnshareFolderError('other')
1278612747

12787-
UpdateFileMemberArgs._all_field_names_ = ChangeFileMemberAccessArgs._all_field_names_.union(set([]))
12788-
UpdateFileMemberArgs._all_fields_ = ChangeFileMemberAccessArgs._all_fields_ + []
12748+
UpdateFileMemberArgs.file.validator = PathOrId_validator
12749+
UpdateFileMemberArgs.member.validator = MemberSelector_validator
12750+
UpdateFileMemberArgs.access_level.validator = AccessLevel_validator
12751+
UpdateFileMemberArgs._all_field_names_ = set([
12752+
'file',
12753+
'member',
12754+
'access_level',
12755+
])
12756+
UpdateFileMemberArgs._all_fields_ = [
12757+
('file', UpdateFileMemberArgs.file.validator),
12758+
('member', UpdateFileMemberArgs.member.validator),
12759+
('access_level', UpdateFileMemberArgs.access_level.validator),
12760+
]
1278912761

1279012762
UpdateFolderMemberArg.shared_folder_id.validator = common.SharedFolderId_validator
1279112763
UpdateFolderMemberArg.member.validator = MemberSelector_validator
@@ -12982,17 +12954,6 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
1298212954
'host': u'api',
1298312955
'style': u'rpc'},
1298412956
)
12985-
change_file_member_access = bb.Route(
12986-
'change_file_member_access',
12987-
1,
12988-
True,
12989-
ChangeFileMemberAccessArgs_validator,
12990-
FileMemberActionResult_validator,
12991-
FileMemberActionError_validator,
12992-
{'auth': u'user',
12993-
'host': u'api',
12994-
'style': u'rpc'},
12995-
)
1299612957
check_job_status = bb.Route(
1299712958
'check_job_status',
1299812959
1,
@@ -13437,7 +13398,6 @@ def _process_custom_annotations(self, annotation_type, field_path, processor):
1343713398
ROUTES = {
1343813399
'add_file_member': add_file_member,
1343913400
'add_folder_member': add_folder_member,
13440-
'change_file_member_access': change_file_member_access,
1344113401
'check_job_status': check_job_status,
1344213402
'check_remove_member_job_status': check_remove_member_job_status,
1344313403
'check_share_job_status': check_share_job_status,

0 commit comments

Comments
 (0)