Merge lp:~dobey/ubuntuone-storage-protocol/update-13-10 into lp:ubuntuone-storage-protocol/stable-13-10

[dobey]

[Rodney Dawes]

    Fix a typo (ensure vs assure).
    Change the example-in-docstring to not look like a doctest.

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-storage-protocol/update-13-10 into lp:ubuntuone-storage-protocol/stable-13-10 failed. Below is the output from the failed tests.

running build

*** Cannot find protoc; is the protobuf-compiler package installed?

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-storage-protocol/update-13-10 into lp:ubuntuone-storage-protocol/stable-13-10 failed. Below is the output from the failed tests.

running build

*** Cannot find protoc; is the protobuf-compiler package installed?

=== modified file 'ubuntuone/storageprotocol/request.py'
--- ubuntuone/storageprotocol/request.py	2013-05-21 17:22:58 +0000
+++ ubuntuone/storageprotocol/request.py	2013-08-06 13:58:41 +0000
@@ -441,11 +441,11 @@
     def cancel_filter(self, function):
         """Raises RequestCancelledError if the request is cancelled.
 
-        This methods exists to be used in a addCallback sequence to assure
+        This methods exists to be used in a addCallback sequence to ensure
         that it does not continue if the request is cancelled, like:
 
-        >>> d.addCallback(cancel_filter(foo))
-        >>> d.addCallbacks(done_callback, error_errback)
+        d.addCallback(cancel_filter(foo))
+        d.addCallbacks(done_callback, error_errback)
 
         Note that you may receive RequestCancelledError in your
         'error_errback' func.