Merge "Fix examples and missing code-block"

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>,

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