Skip to content

Commit 05ae216

Browse files
author
Kevin McDonald
committed
Update copyright year. Add SoftLayerListResult to docs
1 parent 50c60bd commit 05ae216

File tree

5 files changed

+28
-16
lines changed

5 files changed

+28
-16
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
1+
Copyright (c) 2015 SoftLayer Technologies, Inc. All rights reserved.
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

SoftLayer/__init__.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
>>> import SoftLayer
99
>>> client = SoftLayer.create_client_from_env(username="username",
1010
api_key="api_key")
11-
>>> resp = client['Account'].getObject()
11+
>>> resp = client.call('Account', 'getObject')
1212
>>> resp['companyName']
1313
'Your Company'
1414
@@ -27,7 +27,15 @@
2727
__version__ = consts.VERSION
2828
__author__ = 'SoftLayer Technologies, Inc.'
2929
__license__ = 'MIT'
30-
__copyright__ = 'Copyright 2014 SoftLayer Technologies, Inc.'
31-
__all__ = ['BaseClient', 'create_client_from_env', 'Client',
32-
'BasicAuthentication', 'SoftLayerError', 'SoftLayerAPIError',
33-
'API_PUBLIC_ENDPOINT', 'API_PRIVATE_ENDPOINT']
30+
__copyright__ = 'Copyright 2015 SoftLayer Technologies, Inc.'
31+
__all__ = [
32+
'BaseClient',
33+
'create_client_from_env',
34+
'Client',
35+
'BasicAuthentication',
36+
'SoftLayerError',
37+
'SoftLayerAPIError',
38+
'SoftLayerListResult',
39+
'API_PUBLIC_ENDPOINT',
40+
'API_PRIVATE_ENDPOINT',
41+
]

SoftLayer/transports.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
'RestTransport',
2727
'TimingTransport',
2828
'FixtureTransport',
29+
'SoftLayerListResult',
2930
]
3031

3132
REST_SPECIAL_METHODS = {
@@ -85,10 +86,14 @@ def __init__(self):
8586

8687

8788
class SoftLayerListResult(list):
88-
"""A SoftLayer list result."""
89+
"""A SoftLayer API list result."""
8990

9091
def __init__(self, items, total_count):
92+
93+
#: total count of items that exist on the server. This is useful when
94+
#: paginating through a large list of objects.
9195
self.total_count = total_count
96+
9297
super(SoftLayerListResult, self).__init__(items)
9398

9499

docs/api/client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,4 @@ API Reference
165165
-------------
166166

167167
.. automodule:: SoftLayer
168-
:members:
168+
:members:

docs/index.rst

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@ Contributing
3737

3838
External Links
3939
--------------
40-
.. toctree::
4140

42-
SoftLayer API Documentation <http://developer.softlayer.com/reference/softlayerapi>
43-
Source on GitHub <https://github.com/softlayer/softlayer-python>
44-
Issues <https://github.com/softlayer/softlayer-python/issues>
45-
Pull Requests <https://github.com/softlayer/softlayer-python/pulls>
46-
PyPI <https://pypi.python.org/pypi/softlayer/>
47-
Twitter <https://twitter.com/SoftLayerDevs>
48-
#softlayer on freenode <irc://irc.freenode.net/#softlayer>
41+
* `SoftLayer API Documentation <http://developer.softlayer.com/reference/softlayerapi>`_
42+
* `Source on GitHub <https://github.com/softlayer/softlayer-python>`_
43+
* `Issues <https://github.com/softlayer/softlayer-python/issues>`_
44+
* `Pull Requests <https://github.com/softlayer/softlayer-python/pulls>`_
45+
* `PyPI <https://pypi.python.org/pypi/softlayer/>`_
46+
* `Twitter <https://twitter.com/SoftLayerDevs>`_
47+
* `#softlayer on freenode <irc://irc.freenode.net/#softlayer>`_

0 commit comments

Comments
 (0)