Skip to content

Commit e325da5

Browse files
authored
Merge pull request #160
Prepare for alpha release of 2.0.0 Bump version to 2.0.0a1. Add @kelseymorris95 to AUTHORS. Fix up docstrings for Sphinx, and update docs sources. Clean up release notes.
2 parents 309336d + 8374720 commit e325da5

File tree

9 files changed

+62
-7
lines changed

9 files changed

+62
-7
lines changed

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ used to interact with the Box API. This is a list of contributors.
77
- `@hnguyen08 <https://github.com/hnguyen08>`_
88
- `@potrebic <https://github.com/potrebic>`_
99
- `@nsundareswaran <https://github.com/nsundareswaran>`_
10+
- `@kelseymorris95 <https://github.com/kelseymorris95>`_

HISTORY.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
Release History
44
---------------
55

6-
Upcoming
7-
++++++++
8-
9-
New Release?
10-
++++++++++++++++++
6+
2.0.0 (Upcoming)
7+
++++++++++++++++
118

129
**Breaking Changes**
1310

@@ -40,7 +37,7 @@ New Release?
4037
``BaseAPIJSONObject``, ``APIJSONObject``, was created to represent pseudo-smart objects such as ``Event`` that are not
4138
directly accessible through an API endpoint.
4239

43-
1.5.3
40+
1.5.3 (2016-05-26)
4441
++++++++++++++++++
4542

4643
- Bugfix so that ``JWTAuth`` opens the PEM private key file in ``'rb'`` mode.

boxsdk/exception.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ def __unicode__(self):
102102
def status(self):
103103
"""
104104
The status code of the network response that is responsible for the exception.
105+
105106
:rtype: `int`
106107
"""
107108
return self._status
@@ -110,18 +111,25 @@ def status(self):
110111
def code(self):
111112
"""
112113
The explanation of the status code of the network response that is responsible for the exception.
114+
113115
:rtype: `int`
114116
"""
115117
return self._code
116118

117119
@property
118120
def message(self):
121+
"""
122+
The message associated with the exception, e.g. 'message' field of the json in the failed response.
123+
124+
:rtype: `unicode`
125+
"""
119126
return self._message
120127

121128
@property
122129
def request_id(self):
123130
"""
124131
The id the network request that is responsible for the exception.
132+
125133
:rtype: `unicode`
126134
"""
127135
return self._request_id
@@ -130,6 +138,7 @@ def request_id(self):
130138
def url(self):
131139
"""
132140
The URL of the network request that is responsible for the exception.
141+
133142
:rtype: `unicode`
134143
"""
135144
return self._url
@@ -138,6 +147,7 @@ def url(self):
138147
def method(self):
139148
"""
140149
The HTTP verb of the request that is responsible for the exception.
150+
141151
:rtype: `unicode`
142152
"""
143153
return self._method
@@ -146,6 +156,7 @@ def method(self):
146156
def context_info(self):
147157
"""
148158
The context_info returned in the failed response.
159+
149160
:rtype: `dict`
150161
"""
151162
return self._context_info
@@ -154,6 +165,7 @@ def context_info(self):
154165
def network_response(self):
155166
"""
156167
The response returned from the network.
168+
157169
:rtype: `NetworkResponse`
158170
"""
159171
return self._network_response

boxsdk/network/default_network.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ def access_token_used(self):
7676
def request_response(self):
7777
"""
7878
The response returned from the Requests library.
79+
7980
:rtype: `Response`
8081
"""
8182
return self._request_response

boxsdk/object/base_api_json_object.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def _description(self):
6767
def response_object(self):
6868
"""
6969
Return the JSON object representing the object returned from a Box API request.
70+
7071
:rtype:
7172
`dict`
7273
"""

boxsdk/object/cloneable.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Cloneable(object):
1212
def as_user(self, user):
1313
"""
1414
Returns a new endpoint object with default headers set up to make requests as the specified user.
15+
1516
:param user:
1617
The user to impersonate when making API requests.
1718
:type user:
@@ -22,6 +23,7 @@ def as_user(self, user):
2223
def with_shared_link(self, shared_link, shared_link_password):
2324
"""
2425
Returns a new endpoint object with default headers set up to make requests using the shared link for auth.
26+
2527
:param shared_link:
2628
The shared link.
2729
:type shared_link:
@@ -36,6 +38,7 @@ def with_shared_link(self, shared_link, shared_link_password):
3638
def clone(self, session=None):
3739
"""
3840
Returns a copy of this cloneable object using the specified session.
41+
3942
:param session:
4043
The Box session used to make requests.
4144
:type session:

boxsdk/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
from __future__ import unicode_literals, absolute_import
44

55

6-
__version__ = '1.5.3'
6+
__version__ = '2.0.0a1'

docs/source/boxsdk.object.rst

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ boxsdk.object package
44
Submodules
55
----------
66

7+
boxsdk.object.api_json_object module
8+
------------------------------------
9+
10+
.. automodule:: boxsdk.object.api_json_object
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
boxsdk.object.base_api_json_object module
16+
-----------------------------------------
17+
18+
.. automodule:: boxsdk.object.base_api_json_object
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
22+
723
boxsdk.object.base_endpoint module
824
----------------------------------
925

@@ -20,6 +36,14 @@ boxsdk.object.base_object module
2036
:undoc-members:
2137
:show-inheritance:
2238

39+
boxsdk.object.cloneable module
40+
------------------------------
41+
42+
.. automodule:: boxsdk.object.cloneable
43+
:members:
44+
:undoc-members:
45+
:show-inheritance:
46+
2347
boxsdk.object.collaboration module
2448
----------------------------------
2549

@@ -28,6 +52,14 @@ boxsdk.object.collaboration module
2852
:undoc-members:
2953
:show-inheritance:
3054

55+
boxsdk.object.event module
56+
--------------------------
57+
58+
.. automodule:: boxsdk.object.event
59+
:members:
60+
:undoc-members:
61+
:show-inheritance:
62+
3163
boxsdk.object.events module
3264
---------------------------
3365

docs/source/boxsdk.util.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ boxsdk.util package
44
Submodules
55
----------
66

7+
boxsdk.util.api_call_decorator module
8+
-------------------------------------
9+
10+
.. automodule:: boxsdk.util.api_call_decorator
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
715
boxsdk.util.compat module
816
-------------------------
917

0 commit comments

Comments
 (0)