diff --git a/doc/source/service-api.rst b/doc/source/service-api.rst
index 50dd80e8..4da68a37 100644
--- a/doc/source/service-api.rst
+++ b/doc/source/service-api.rst
@@ -756,6 +756,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 1b1e3490..0715b19a 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