summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJoel Wright <joel.wright@sohonet.com>2016-06-04 11:23:02 +0100
committerMatthew Oliver <matt@oliver.net.au>2016-08-25 11:27:49 +0000
commitdaed43a44ae77a58ae52033d95f23a0bdb4d6c49 (patch)
tree523a65f3fcec228195a0f28e78e7b514fedd433b /examples
parente1e2678cd0a99955c280a813e10c6ce7494389cd (diff)
downloadpython-swiftclient-daed43a44ae77a58ae52033d95f23a0bdb4d6c49.tar.gz
Fix examples and missing code-block
This patch fixes a missing code-block section in the capabilities section of service-api.rst, and fixes the import of walk in the upload.py examples to support both python2 and python3. Change-Id: I572769f971f84e0029f2948e42c130e73517f434
Diffstat (limited to 'examples')
-rw-r--r--examples/upload.py3
1 files changed, 2 insertions, 1 deletions
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