diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-25 20:29:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-25 20:29:54 +0000 |
| commit | a2371cc6d8937ac62124f7c5c9d06b84c9b1406e (patch) | |
| tree | 44c0d99909368a6ae3e22e64a5c4e351a138070b | |
| parent | 5acefd27e4e4de01414cc67f6652cc946b51957b (diff) | |
| parent | daed43a44ae77a58ae52033d95f23a0bdb4d6c49 (diff) | |
| download | python-swiftclient-a2371cc6d8937ac62124f7c5c9d06b84c9b1406e.tar.gz | |
Merge "Fix examples and missing code-block"
| -rw-r--r-- | doc/source/service-api.rst | 2 | ||||
| -rw-r--r-- | examples/upload.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/source/service-api.rst b/doc/source/service-api.rst index ea530b0..02b12d0 100644 --- a/doc/source/service-api.rst +++ b/doc/source/service-api.rst @@ -833,6 +833,8 @@ the method docstring. For each successful call to list capabilities, a result dictionary will be returned with the contents described below: +.. code-block:: python + { 'action': 'capabilities', 'timestamp': <time of the call>, diff --git a/examples/upload.py b/examples/upload.py index 1b1e349..0715b19 100644 --- a/examples/upload.py +++ b/examples/upload.py @@ -1,6 +1,7 @@ import logging -from os.path import join, walk +from os import walk +from os.path import join from swiftclient.multithreading import OutputManager from swiftclient.service import SwiftError, SwiftService, SwiftUploadObject from sys import argv |