Commit 397c1056 authored by Michael Fladischer's avatar Michael Fladischer

Updated version 8.4.0 from 'upstream/8.4.0'

with Debian dir b579fe79aaaaf9ab058665a740c7574d5c6ee76b
parents ea582872 169f3898
Metadata-Version: 1.1
Name: dropbox
Version: 8.0.0
Version: 8.4.0
Summary: Official Dropbox API Client
Home-page: http://www.dropbox.com/developers
Author: Dropbox
......@@ -9,7 +9,7 @@ License: MIT License
Description: Dropbox for Python
==================
.. image:: https://travis-ci.org/dropbox/dropbox-sdk-python.svg?branch=v8.0.0
.. image:: https://travis-ci.org/dropbox/dropbox-sdk-python.svg?branch=v8.4.0
:target: https://travis-ci.org/dropbox/dropbox-sdk-python
.. image:: https://readthedocs.org/projects/dropbox-sdk-python/badge/?version=stable
......
Dropbox for Python
==================
.. image:: https://travis-ci.org/dropbox/dropbox-sdk-python.svg?branch=v8.0.0
.. image:: https://travis-ci.org/dropbox/dropbox-sdk-python.svg?branch=v8.4.0
:target: https://travis-ci.org/dropbox/dropbox-sdk-python
.. image:: https://readthedocs.org/projects/dropbox-sdk-python/badge/?version=stable
......
Metadata-Version: 1.1
Name: dropbox
Version: 8.0.0
Version: 8.4.0
Summary: Official Dropbox API Client
Home-page: http://www.dropbox.com/developers
Author: Dropbox
......@@ -9,7 +9,7 @@ License: MIT License
Description: Dropbox for Python
==================
.. image:: https://travis-ci.org/dropbox/dropbox-sdk-python.svg?branch=v8.0.0
.. image:: https://travis-ci.org/dropbox/dropbox-sdk-python.svg?branch=v8.4.0
:target: https://travis-ci.org/dropbox/dropbox-sdk-python
.. image:: https://readthedocs.org/projects/dropbox-sdk-python/badge/?version=stable
......
......@@ -12,6 +12,8 @@ dropbox/base_team.py
dropbox/common.py
dropbox/dropbox.py
dropbox/exceptions.py
dropbox/file_properties.py
dropbox/file_requests.py
dropbox/files.py
dropbox/oauth.py
dropbox/paper.py
......
requests >= 2.5.1, != 2.6.1, !=2.16.0, !=2.16.1
requests >= 2.16.2
six >= 1.3.0
urllib3
This diff is collapsed.
This diff is collapsed.
......@@ -73,16 +73,16 @@ class PathRoot(bb.Union):
:ivar home: Paths are relative to the authenticating user's home directory,
whether or not that user belongs to a team.
:ivar member_home: Paths are relative to the authenticating team member's
home directory. (This results in :field:`PathRootError.invalid' if the
user does not belong to a team.)
home directory. (This results in ``PathRootError.invalid`` if the user
does not belong to a team.).
:ivar str team: Paths are relative to the given team directory. (This
results in :field:`PathRootError.invalid` if the user is not a member of
the team associated with that path root id.)
the team associated with that path root id.).
:ivar user_home: Paths are relative to the user's home directory. (This
results in ``PathRootError.invalid`` if the belongs to a team.)
:ivar str shared_folder: Paths are relative to given shared folder id (This
results in ``PathRootError.invalid`` if the belongs to a team.).
:ivar str namespace_id: Paths are relative to given namespace id (This
results in :field:`PathRootError.no_permission` if you don't have access
to this shared folder.)
to this namespace.).
"""
_catch_all = 'other'
......@@ -107,15 +107,15 @@ class PathRoot(bb.Union):
return cls('team', val)
@classmethod
def shared_folder(cls, val):
def namespace_id(cls, val):
"""
Create an instance of this class set to the ``shared_folder`` tag with
Create an instance of this class set to the ``namespace_id`` tag with
value ``val``.
:param str val:
:rtype: PathRoot
"""
return cls('shared_folder', val)
return cls('namespace_id', val)
def is_home(self):
"""
......@@ -149,13 +149,13 @@ class PathRoot(bb.Union):
"""
return self._tag == 'user_home'
def is_shared_folder(self):
def is_namespace_id(self):
"""
Check if the union tag is ``shared_folder``.
Check if the union tag is ``namespace_id``.
:rtype: bool
"""
return self._tag == 'shared_folder'
return self._tag == 'namespace_id'
def is_other(self):
"""
......@@ -169,7 +169,7 @@ class PathRoot(bb.Union):
"""
Paths are relative to the given team directory. (This results in
``PathRootError.invalid`` if the user is not a member of the team
associated with that path root id.)
associated with that path root id.).
Only call this if :meth:`is_team` is true.
......@@ -179,18 +179,18 @@ class PathRoot(bb.Union):
raise AttributeError("tag 'team' not set")
return self._value
def get_shared_folder(self):
def get_namespace_id(self):
"""
Paths are relative to given shared folder id (This results in
``PathRootError.no_permission`` if you don't have access to this shared
folder.)
Paths are relative to given namespace id (This results in
``PathRootError.no_permission`` if you don't have access to this
namespace.).
Only call this if :meth:`is_shared_folder` is true.
Only call this if :meth:`is_namespace_id` is true.
:rtype: str
"""
if not self.is_shared_folder():
raise AttributeError("tag 'shared_folder' not set")
if not self.is_namespace_id():
raise AttributeError("tag 'namespace_id' not set")
return self._value
def __repr__(self):
......@@ -271,10 +271,14 @@ PathRootError_validator = bv.Union(PathRootError)
Date_validator = bv.Timestamp(u'%Y-%m-%d')
DisplayName_validator = bv.String(min_length=1, pattern=u'[^/:?*<>"|]*')
DisplayNameLegacy_validator = bv.String(min_length=1)
DropboxTimestamp_validator = bv.Timestamp(u'%Y-%m-%dT%H:%M:%SZ')
EmailAddress_validator = bv.String(max_length=255, pattern=u"^['&A-Za-z0-9._%+-]+@[A-Za-z0-9-][A-Za-z0-9.-]*.[A-Za-z]{2,15}$")
# A ISO639-1 code.
LanguageCode_validator = bv.String(min_length=2)
NamePart_validator = bv.String(min_length=1, max_length=100, pattern=u'[^/:?*<>"|]*')
NamespaceId_validator = bv.String(pattern=u'[-_0-9a-zA-Z:]+')
OptionalNamePart_validator = bv.String(max_length=100, pattern=u'[^/:?*<>"|]*')
PathRootId_validator = NamespaceId_validator
SessionId_validator = bv.String()
SharedFolderId_validator = NamespaceId_validator
......@@ -286,14 +290,14 @@ PathRoot._home_validator = bv.Void()
PathRoot._member_home_validator = bv.Void()
PathRoot._team_validator = PathRootId_validator
PathRoot._user_home_validator = bv.Void()
PathRoot._shared_folder_validator = PathRootId_validator
PathRoot._namespace_id_validator = PathRootId_validator
PathRoot._other_validator = bv.Void()
PathRoot._tagmap = {
'home': PathRoot._home_validator,
'member_home': PathRoot._member_home_validator,
'team': PathRoot._team_validator,
'user_home': PathRoot._user_home_validator,
'shared_folder': PathRoot._shared_folder_validator,
'namespace_id': PathRoot._namespace_id_validator,
'other': PathRoot._other_validator,
}
......
......@@ -6,7 +6,7 @@ __all__ = [
# This should always be 0.0.0 in master. Only update this after tagging
# before release.
__version__ = '8.0.0'
__version__ = '8.4.0'
import contextlib
import json
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -121,10 +121,18 @@ class DropboxOAuth2FlowBase(object):
d = resp.json()
if 'team_id' in d:
account_id = d['team_id']
else:
account_id = d['account_id']
access_token = d['access_token']
uid = d['uid']
return OAuth2FlowNoRedirectResult(
d['access_token'],
d['account_id'],
d['uid'])
access_token,
account_id,
uid)
def build_path(self, target, params=None):
"""Build the path component for an API URL.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -3,7 +3,7 @@
# flake8: noqa
# pylint: skip-file
"""
This namespace contains common data types used within the users namespace
This namespace contains common data types used within the users namespace.
"""
try:
......
......@@ -10,4 +10,5 @@ norecursedirs = .tox .venv .venv-* stone
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0
......@@ -25,9 +25,8 @@ for line in open(dbx_mod_path):
version = eval(line.split('=', 1)[1].strip()) # pylint: disable=eval-used
install_reqs = [
'requests >= 2.5.1, != 2.6.1, !=2.16.0, !=2.16.1',
'requests >= 2.16.2',
'six >= 1.3.0',
'urllib3',
]
setup_requires = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment