Merge lp:~nataliabidart/magicicada-protocol/update-copyright-headers into lp:magicicada-protocol

[Natalia Bidart]

- Added proper copyright notices and coding headers.

[Natalia Bidart (nataliabidart)]

Trivial.

review: Approve

=== modified file 'run-tests'
--- run-tests	2016-09-18 23:26:42 +0000
+++ run-tests	2018-04-08 19:37:28 +0000
@@ -21,11 +21,11 @@
 
 /usr/bin/env python setup.py build
 # run the tests with pure python protobuf
-SSL_CERTIFICATES_DIR=tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python u1trial tests
+SSL_CERTIFICATES_DIR=ubuntuone/storageprotocol/tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python u1trial ubuntuone/storageprotocol/tests
 if [ "$SYSNAME" != "Darwin" ]; then
     # and with the cpp extension, for server (linux) only:
     if [ $PROTOC_VERSION_AS_INT -lt 2500 ]; then
-        SSL_CERTIFICATES_DIR=tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp u1trial tests
+        SSL_CERTIFICATES_DIR=ubuntuone/storageprotocol/tests/certs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp u1trial ubuntuone/storageprotocol/tests
     fi
 fi
 

=== modified file 'samples/easy_client.py'
--- samples/easy_client.py	2016-09-19 02:00:32 +0000
+++ samples/easy_client.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
-# ubuntuone.storageprotocol.samples.easy_client - a simple client
-#
-# Author: Lucio Torre <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,8 +27,9 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""A simple client with some tests
-"""
+
+"""A simple client with some tests."""
+
 import os
 import time
 import math
@@ -41,8 +41,8 @@
 from ubuntuone.storageprotocol.client import (
     StorageClientFactory, StorageClient)
 from ubuntuone.storageprotocol import request, protocol_pb2
-from ubuntuone.storageprotocol.dircontent_pb2 import \
-    DirectoryContent, DIRECTORY
+from ubuntuone.storageprotocol.dircontent_pb2 import (
+    DirectoryContent, DIRECTORY)
 
 
 class NotDirectory(Exception):
@@ -51,8 +51,7 @@
 
 def delay_time(step):
     """generates a delay for each step"""
-    return (((math.exp(step) - 1) / 10) /
-            (1 + random.random()))
+    return ((math.exp(step) - 1) / 10) / (1 + random.random())
 
 
 def retry(function):
@@ -91,7 +90,6 @@
 
     def connectionMade(self):
         """Setup and call callback."""
-        # pylint: disable=W0201
         StorageClient.connectionMade(self)
         self.factory.clientConnectionMade(self)
 
@@ -158,15 +156,15 @@
     def mkfile(self, name):
         """make a file named name in cwd."""
         d = self.get_cwd_id()
-        d.addCallback(lambda _:
-            self.make_file(request.ROOT, self.cwd_id, name))
+        d.addCallback(
+            lambda _: self.make_file(request.ROOT, self.cwd_id, name))
         return d
 
     def mkdir(self, name):
         """make a dir named name in cwd."""
         d = self.get_cwd_id()
-        d.addCallback(lambda _:
-            self.make_dir(request.ROOT, self.cwd_id, name))
+        d.addCallback(
+            lambda _: self.make_dir(request.ROOT, self.cwd_id, name))
         return d
 
     def put(self, name, content):

=== modified file 'samples/ping_client.py'
--- samples/ping_client.py	2016-09-19 02:00:32 +0000
+++ samples/ping_client.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
-# ubuntuone.storageprotocol.samples.ping_client - a ping client
-#
-# Author: Lucio Torre <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,8 +27,8 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""A simple ping client
-"""
+
+"""A simple ping client."""
 
 from twisted.internet import reactor
 
@@ -42,7 +41,6 @@
 
     def connectionMade(self):
         """Setup and call callback."""
-        # pylint: disable=W0201
         StorageClient.connectionMade(self)
         print "Connection made."
         d = self.ping()
@@ -63,7 +61,6 @@
 
 class PingClientFactory(StorageClientFactory):
     """A test oriented protocol factory."""
-    # no init: pylint: disable=W0232
 
     protocol = PingClient
 

=== modified file 'ubuntuone/__init__.py'
--- ubuntuone/__init__.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/__init__.py	2018-04-08 19:37:28 +0000
@@ -1,6 +1,7 @@
-# __init__.py
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -26,5 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""ubuntuone package"""
+
+"""ubuntuone package."""
+
 __import__('pkg_resources').declare_namespace(__name__)

=== modified file 'ubuntuone/storageprotocol/__init__.py'
--- ubuntuone/storageprotocol/__init__.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/__init__.py	2018-04-08 19:37:28 +0000
@@ -1,6 +1,7 @@
-# __init__.py
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -26,4 +27,5 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """ubuntuone.storageprotocol package."""

=== modified file 'ubuntuone/storageprotocol/client.py'
--- ubuntuone/storageprotocol/client.py	2016-11-15 23:37:49 +0000
+++ ubuntuone/storageprotocol/client.py	2018-04-08 19:37:28 +0000
@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
+#
 # Copyright 2009-2015 Canonical Ltd.
-# Copyright 2016 Chicharreros (https://launchpad.net/~chicharreros)
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -616,7 +618,6 @@
 
     def processMessage(self, message):
         """Process messages."""
-        # pylint: disable=W0201
         if message.type == protocol_pb2.Message.NODE_ATTR:
             if self.node_attr_callback is not None:
                 self.node_attr_callback(
@@ -667,7 +668,6 @@
 
     def _start(self):
         """Send the LIST_SHARES message to the server."""
-        # pylint: disable=W0201
         message = protocol_pb2.Message()
         message.type = protocol_pb2.Message.LIST_SHARES
         self.sendMessage(message)
@@ -935,7 +935,6 @@
 
     @ivar new_generation: the generation that the volume is at now
     """
-    # pylint: disable=C0111
 
     __slots__ = ('share', 'node', 'new_generation')
 
@@ -1361,7 +1360,6 @@
 
     def processMessage(self, message):
         """Handle messages."""
-        # pylint: disable=W0201
         if message.type == self.create_response:
             self.new_id = message.new.node
             self.new_parent_id = message.new.parent_node
@@ -1406,7 +1404,6 @@
 
     def processMessage(self, message):
         """Handle messages."""
-        # pylint: disable=W0201
         if message.type == protocol_pb2.Message.PROTOCOL_VERSION:
             self.other_protocol_version = message.protocol.version
             self.done()
@@ -1520,7 +1517,6 @@
 
     def _start(self):
         """Send the FREE_SPACE_INQUIRY message to the server."""
-        # pylint: disable=W0201
         message = protocol_pb2.Message()
         message.type = protocol_pb2.Message.FREE_SPACE_INQUIRY
         message.free_space_inquiry.share_id = self.share_id
@@ -1529,7 +1525,6 @@
 
     def processMessage(self, message):
         """Process the answer from the server."""
-        # pylint: disable=W0201
         if message.type == protocol_pb2.Message.FREE_SPACE_INFO:
             self.free_bytes = message.free_space_info.free_bytes
             self.done()
@@ -1544,7 +1539,6 @@
 
     def _start(self):
         """Send the FREE_SPACE_INQUIRY message to the server."""
-        # pylint: disable=W0201
         message = protocol_pb2.Message()
         message.type = protocol_pb2.Message.ACCOUNT_INQUIRY
         self.sendMessage(message)
@@ -1552,7 +1546,6 @@
 
     def processMessage(self, message):
         """Process the answer from the server."""
-        # pylint: disable=W0201
         if message.type == protocol_pb2.Message.ACCOUNT_INFO:
             self.purchased_bytes = message.account_info.purchased_bytes
             self.done()
@@ -1682,7 +1675,7 @@
 
 class StorageClientFactory(ClientFactory):
     """StorageClient factory."""
-    # pylint: disable=W0232
+
     protocol = StorageClient
 
 
@@ -1735,10 +1728,9 @@
         if not self.valid_limit(limit):
             raise ValueError('Read limit must be greater than 0.')
         self._readLimit = limit
-    # it's a property, pylint: disable=W0212
+
     readLimit = property(lambda self: self._readLimit, _set_read_limit)
     writeLimit = property(lambda self: self._writeLimit, _set_write_limit)
-    # pylint: enable=W0212
 
     def callLater(self, period, func, *args, **kwargs):
         """Wrapper around L{reactor.callLater} for test purpose."""

=== modified file 'ubuntuone/storageprotocol/content_hash.py'
--- ubuntuone/storageprotocol/content_hash.py	2016-09-19 02:00:32 +0000
+++ ubuntuone/storageprotocol/content_hash.py	2018-04-08 19:37:28 +0000
@@ -1,9 +1,7 @@
-# ubuntuone.storageprotocol.content_hash - content hash handling
-#
-# Author: Lucio Torre <[e-mail]>
-#         Natalia B. Bidart <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -29,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Hash Handling Stuffs."""
 
 import copy

=== modified file 'ubuntuone/storageprotocol/context.py'
--- ubuntuone/storageprotocol/context.py	2015-07-17 12:59:41 +0000
+++ ubuntuone/storageprotocol/context.py	2018-04-08 19:37:28 +0000
@@ -1,6 +1,7 @@
-# ubuntuone.storageprotocol.context - ssl context creation
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2015 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -26,9 +27,9 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""
-Standard Routines for working with ssl context creation
-"""
+
+"""Standard Routines for working with ssl context creation."""
+
 import os
 
 from OpenSSL import SSL

=== modified file 'ubuntuone/storageprotocol/delta.py'
--- ubuntuone/storageprotocol/delta.py	2012-12-03 19:45:43 +0000
+++ ubuntuone/storageprotocol/delta.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
-# ubuntuone.storageprotocol.delta - delta nodes wrappers
-#
-# Author: Lucio Torre <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,18 +27,18 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""
-Provides wrapper classes for delta nodes messages
-"""
+
+"""Provides wrapper classes for delta nodes messages."""
 
 from ubuntuone.storageprotocol import protocol_pb2
 
 FILE = 0
 DIRECTORY = 1
 
-file_type_registry = {protocol_pb2.FileInfo.FILE: FILE,
-                      protocol_pb2.FileInfo.DIRECTORY: DIRECTORY,
-                      }
+file_type_registry = {
+    protocol_pb2.FileInfo.FILE: FILE,
+    protocol_pb2.FileInfo.DIRECTORY: DIRECTORY,
+}
 
 
 class FileInfoDelta(object):

=== modified file 'ubuntuone/storageprotocol/dircontent.proto'
--- ubuntuone/storageprotocol/dircontent.proto	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/dircontent.proto	2018-04-08 19:37:28 +0000
@@ -1,7 +1,6 @@
 /*
- ubuntuone.storageprotocol.dircontent_pb2 - dircontent protocol
-
  Copyright 2009-2012 Canonical Ltd.
+ Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 
  This program is free software: you can redistribute it and/or modify it 
  under the terms of the GNU Affero General Public License version 3,

=== modified file 'ubuntuone/storageprotocol/dircontent.py'
--- ubuntuone/storageprotocol/dircontent.py	2013-05-21 17:22:58 +0000
+++ ubuntuone/storageprotocol/dircontent.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
-# ubuntuone.storageprotocol.dircontent - directory content handling
-#
-# Author: Tim Cole <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,10 +27,8 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""
-Standard routines for working with directory content.
 
-"""
+"""Standard routines for working with directory content."""
 
 import re
 from ubuntuone.storageprotocol.dircontent_pb2 import DirectoryContent

=== modified file 'ubuntuone/storageprotocol/errors.py'
--- ubuntuone/storageprotocol/errors.py	2012-12-03 19:45:43 +0000
+++ ubuntuone/storageprotocol/errors.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Natalia B. Bidart <[e-mail]>
-#
 # Copyright 2010-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """The errors abstraction."""
 
 import uuid
@@ -56,9 +56,8 @@
         @param request: the request that generated this error.
         @param message: the message received that generated the error.
         """
-        error_name = protocol_pb2.Error.DESCRIPTOR \
-                 .enum_types_by_name['ErrorType'] \
-                 .values_by_number[message.error.type].name
+        error_name = protocol_pb2.Error.DESCRIPTOR.enum_types_by_name[
+            'ErrorType'].values_by_number[message.error.type].name
         super(StorageRequestError, self).__init__(error_name)
         #: the request that generated the error
         self.request = request

=== modified file 'ubuntuone/storageprotocol/protocol.proto'
--- ubuntuone/storageprotocol/protocol.proto	2016-11-07 01:11:29 +0000
+++ ubuntuone/storageprotocol/protocol.proto	2018-04-08 19:37:28 +0000
@@ -1,6 +1,6 @@
 /*
  Copyright 2009-2012 Canonical Ltd.
- Copyright 2016 Chicharreros (https://launchpad.net/~chicharreros)
+ Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 
  This program is free software: you can redistribute it and/or modify it
  under the terms of the GNU Affero General Public License version 3,

=== modified file 'ubuntuone/storageprotocol/proxy_tunnel.py'
--- ubuntuone/storageprotocol/proxy_tunnel.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/proxy_tunnel.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
-# ubuntuone.storageprotocol.proxy_tunnel - tunnel through proxies
-#
-# Author: Lucio Torre <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,7 +27,9 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Proxy tunelling"""
+
+"""Proxy tunelling."""
+
 import base64
 
 from twisted.internet.protocol import Protocol, ClientFactory, connectionDone
@@ -70,9 +71,8 @@
         self.client_protocol = None
         self.__buffer = ""
         # send request
-        line = "CONNECT %s:%s HTTP/1.0\r\n" % \
-                (self.factory.host, self.factory.port)
-        self.transport.write(line)
+        line = "CONNECT %s:%s HTTP/1.0\r\n"
+        self.transport.write(line % (self.factory.host, self.factory.port))
         # send headers
         self.sendHeader("Host", self.factory.host)
         # do auth
@@ -112,7 +112,6 @@
         """Received a line."""
         if line:
             parts = line.split(" ", 2)
-            # pylint: disable=W0612
             version, status = parts[:2]
             if len(parts) == 3:
                 message = parts[2]
@@ -150,8 +149,8 @@
 
     def clientConnectionFailed(self, connector, reason):
         """Proxy client connection failed."""
-        self.factory.clientConnectionFailed(connector,
-            "Proxy connection error: %s" % (str(reason)))
+        self.factory.clientConnectionFailed(
+            connector, "Proxy connection error: %s" % (str(reason)))
 
 
 def connectHTTPS(proxy_host, proxy_port, host, port, factory,

=== modified file 'ubuntuone/storageprotocol/public_file_info.py'
--- ubuntuone/storageprotocol/public_file_info.py	2016-11-07 01:11:29 +0000
+++ ubuntuone/storageprotocol/public_file_info.py	2018-04-08 19:37:28 +0000
@@ -1,4 +1,6 @@
-# Copyright 2016 Chicharreros (https://launchpad.net/~chicharreros)
+# -*- coding: utf-8 -*-
+#
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,

=== modified file 'ubuntuone/storageprotocol/request.py'
--- ubuntuone/storageprotocol/request.py	2016-09-19 02:00:32 +0000
+++ ubuntuone/storageprotocol/request.py	2018-04-08 19:37:28 +0000
@@ -1,9 +1,7 @@
-# ubuntuone.storageprotocol.request - base classes for
-#                                             network client and server
-#
-# Author: Lucio Torre <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -29,22 +27,20 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""
-The base classes for the network client and server.
+
+"""The base classes for the network client and server.
 
 This classes provide the message serialization, delivery, request
 tracking and message handling.
+
 """
 
-
 import struct
 import time
 
 from twisted.internet.protocol import Protocol, connectionDone
 from twisted.internet.interfaces import IPushProducer
 from twisted.internet import defer
-# pylint and zope dont work
-# pylint: disable=E0611,F0401
 from zope.interface import implements
 
 from ubuntuone.storageprotocol import protocol_pb2, validators
@@ -228,7 +224,7 @@
                 target = self.requests[message.id].processMessage
                 try:
                     result = target(message)
-                except Exception, e:  # pylint: disable=W0703
+                except Exception as e:
                     self.requests[message.id].error(e)
             else:
                 name = protocol_pb2.Message.DESCRIPTOR \
@@ -450,11 +446,10 @@
         'error_errback' func.
         """
         def _f(*args, **kwargs):
-            '''Function to be called from twisted when its time arrives.'''
+            """Function to be called from twisted when its time arrives."""
             if self.cancelled:
-                raise RequestCancelledError("The request id=%d is cancelled! "
-                                            "(before calling %r)" %
-                                                        (self.id, function))
+                msg = "The request id=%d is cancelled! (before calling %r)"
+                raise RequestCancelledError(msg % (self.id, function))
             return function(*args, **kwargs)
         return _f
 
@@ -467,7 +462,6 @@
 
     __slots__ = ('source_message',)
 
-    # pylint: disable=W0223
     def __init__(self, protocol, message):
         """Create a request response.
 
@@ -493,7 +487,6 @@
 
     def _start(self):
         """start the request sending a ping message."""
-        # pylint: disable=W0201
         self.rtt = 0
         self._start_time = time.time()
         message = protocol_pb2.Message()
@@ -504,8 +497,6 @@
     def processMessage(self, message):
         """calculate rtt if message is pong, error otherwise"""
         if message.type == protocol_pb2.Message.PONG:
-            # pylint: disable=W0201
-            # attributes are created in completion
             self.rtt = time.time() - self._start_time
             self.done()
         else:

=== modified file 'ubuntuone/storageprotocol/sharersp.py'
--- ubuntuone/storageprotocol/sharersp.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/sharersp.py	2018-04-08 19:37:28 +0000
@@ -1,10 +1,7 @@
-# ubuntuone.storageprotocol.sharersp.py -
-#           provides a handy class to use Shares
-#
-# Author: Facundo Batista <[e-mail]>
-#         Guillermo Gonzalez <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -30,13 +27,12 @@
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """A handy class to use Shares."""
 
 import uuid
 
 from ubuntuone.storageprotocol import volumes
-# Disable this warning, as we define several things outside __init__ here
-# pylint: disable=W0201
 
 
 class ShareResponse(object):

=== renamed directory 'tests' => 'ubuntuone/storageprotocol/tests'
=== modified file 'ubuntuone/storageprotocol/tests/__init__.py'
--- tests/__init__.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/__init__.py	2018-04-08 19:37:28 +0000
@@ -1,6 +1,5 @@
-# __init__.py
-#
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -26,4 +25,5 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Tests for ubuntuone.storageprotocol"""
+
+"""Tests for ubuntuone.storageprotocol."""

=== modified file 'ubuntuone/storageprotocol/tests/test_bytesproducer.py'
--- tests/test_bytesproducer.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_bytesproducer.py	2018-04-08 19:37:28 +0000
@@ -1,9 +1,7 @@
-# ubuntuone.storageprotocol.tests.test_bytesproducer -
-#     BytesMessageProducer tests
-#
-# Author: Facundo Batista <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -29,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for directory content serialization/unserialization."""
 
 from __future__ import with_statement
@@ -52,9 +51,8 @@
 
     def sendMessage(self, message):
         """Store the message in own list."""
-        name = protocol_pb2.Message.DESCRIPTOR \
-                  .enum_types_by_name['MessageType'] \
-                  .values_by_number[message.type].name
+        name = protocol_pb2.Message.DESCRIPTOR.enum_types_by_name[
+            'MessageType'].values_by_number[message.type].name
         self.messages.append(name)
 
 

=== modified file 'ubuntuone/storageprotocol/tests/test_client.py'
--- tests/test_client.py	2016-11-07 01:11:29 +0000
+++ ubuntuone/storageprotocol/tests/test_client.py	2018-04-08 19:37:28 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+#
 # Copyright 2009-2015 Canonical Ltd.
 # Copyright 2016 Chicharreros (https://launchpad.net/~chicharreros)
 #
@@ -61,12 +61,8 @@
 )
 
 from ubuntuone.storageprotocol import volumes
-from tests import test_delta_info
+from ubuntuone.storageprotocol.tests import test_delta_info
 
-# let's not get picky about aatributes outside __init__ in tests
-# pylint: disable=W0201
-# it's ok to access internals in the test suite
-# pylint: disable=W0212
 
 PATH = u'~/Documents/pdfs/moño/'
 NAME = u'UDF-me'
@@ -217,7 +213,7 @@
         try:
             result = self.client.get_delta(share_id=SHARE, from_generation=0)
             self.assertTrue(self.called, 'GetDelta.start() was called')
-            self.assertTrue(isinstance(result, Deferred))
+            self.assertIsInstance(result, Deferred)
         finally:
             GetDelta.start = original
 
@@ -229,7 +225,7 @@
         try:
             result = self.client.get_delta(share_id=SHARE, from_scratch=True)
             self.assertTrue(self.called, 'GetDelta.start() was called')
-            self.assertTrue(isinstance(result, Deferred))
+            self.assertIsInstance(result, Deferred)
         finally:
             GetDelta.start = original
 
@@ -247,7 +243,7 @@
         try:
             result = self.client.create_udf(path=PATH, name=NAME)
             self.assertTrue(self.called, 'CreateUDF.start() was called')
-            self.assertTrue(isinstance(result, Deferred))
+            self.assertIsInstance(result, Deferred)
         finally:
             CreateUDF.start = original
 
@@ -259,7 +255,7 @@
         try:
             result = self.client.list_volumes()
             self.assertTrue(self.called, 'ListVolumes.start() was called')
-            self.assertTrue(isinstance(result, Deferred))
+            self.assertIsInstance(result, Deferred)
         finally:
             ListVolumes.start = original
 
@@ -271,7 +267,7 @@
         try:
             result = self.client.delete_volume(volume_id=VOLUME)
             self.assertTrue(self.called, 'DeleteVolume.start() was called')
-            self.assertTrue(isinstance(result, Deferred))
+            self.assertIsInstance(result, Deferred)
         finally:
             DeleteVolume.start = original
 

=== modified file 'ubuntuone/storageprotocol/tests/test_context.py'
--- tests/test_context.py	2016-09-19 02:00:32 +0000
+++ ubuntuone/storageprotocol/tests/test_context.py	2018-04-08 19:37:28 +0000
@@ -1,6 +1,7 @@
-# tests.test_context - test ssl context creation
+# -*- coding: utf-8 -*-
 #
 # Copyright 2012-2015 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -87,7 +88,7 @@
         request = crypto.X509Req()
         request.get_subject().CN = common_name
         request.set_pubkey(key)
-        request.sign(key, "md5")
+        request.sign(key, "sha256")
         return request
 
     def _build_cert(self, request, ca_cert, ca_key):
@@ -99,7 +100,7 @@
         certificate.set_pubkey(request.get_pubkey())
         certificate.gmtime_adj_notBefore(0)
         certificate.gmtime_adj_notAfter(3600)  # valid for one hour
-        certificate.sign(ca_key, "md5")
+        certificate.sign(ca_key, "sha256")
         return certificate
 
 
@@ -127,6 +128,15 @@
         self.assertEqual(result, "ok")
 
     @defer.inlineCallbacks
+    def assert_cert_failed_verify(self, server_context, client_context):
+        d = self.verify_context(server_context, client_context)
+        e = yield self.assertFailure(d, SSL.Error)
+        self.assertEqual(len(e.message), 1)
+        expected = ('SSL routines', 'ssl3_get_server_certificate',
+                    'certificate verify failed')
+        self.assertEqual(e.message[0], expected)
+
+    @defer.inlineCallbacks
     def test_no_verify(self):
         """Test the no_verify option."""
         certs = FakeCerts(self, "localhost")
@@ -151,9 +161,7 @@
         client_context = context.get_ssl_context(no_verify=False,
                                                  hostname="localhost")
 
-        d = self.verify_context(server_context, client_context)
-        e = yield self.assertFailure(d, SSL.Error)
-        self.assertEqual(e[0][0][1], "ssl3_get_server_certificate")
+        yield self.assert_cert_failed_verify(server_context, client_context)
 
     @defer.inlineCallbacks
     def test_fails_hostname(self):
@@ -164,10 +172,7 @@
         self.patch(context, "get_certificates", lambda: [certs.ca_cert])
         client_context = context.get_ssl_context(no_verify=False,
                                                  hostname="localhost")
-
-        d = self.verify_context(server_context, client_context)
-        e = yield self.assertFailure(d, SSL.Error)
-        self.assertEqual(e[0][0][1], "ssl3_get_server_certificate")
+        yield self.assert_cert_failed_verify(server_context, client_context)
 
     @defer.inlineCallbacks
     def test_matches_all(self):

=== modified file 'ubuntuone/storageprotocol/tests/test_delta_info.py'
--- tests/test_delta_info.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_delta_info.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Lucio Torre <[e-mail]>
-#
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for generation node data type."""
 
 import unittest

=== modified file 'ubuntuone/storageprotocol/tests/test_dircontent.py'
--- tests/test_dircontent.py	2012-06-26 01:50:53 +0000
+++ ubuntuone/storageprotocol/tests/test_dircontent.py	2018-04-08 19:37:28 +0000
@@ -1,9 +1,7 @@
-# ubuntuone.storageprotocol.tests.test_dircontent -
-#     directory content tests
-#
-# Author: Tim Cole <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -29,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for directory content serialization/unserialization."""
 
 from __future__ import with_statement

=== modified file 'ubuntuone/storageprotocol/tests/test_errors.py'
--- tests/test_errors.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_errors.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Natalia B. Bidart <[e-mail]>
-#
 # Copyright (C) 2010-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for errors module."""
 
 import unittest
@@ -46,24 +46,18 @@
 class ErrorsTestCase(unittest.TestCase):
     """Basic testing of errors mapping."""
 
-    def setUp(self):
-        """Init."""
-
     def test_exceptions_are_storage_protocol_error(self):
         """High level exceptions inherit from StorageProtocolError."""
         for e, args in HIGH_LEVEL_ERRORS.iteritems():
-            self.assertTrue(isinstance(e(**args), errors.StorageProtocolError),
-                            "%r must inherit from StorageProtocolError" % e)
+            self.assertIsInstance(e(**args), errors.StorageProtocolError)
 
     def test_mapping(self):
         """Protocol's specific exceptions are correct."""
         for code_error, proto_error in errors._error_mapping.iteritems():
-            self.assertTrue(isinstance(proto_error(**REQ_ARGS),
-                            errors.StorageRequestError),
-                            "%r must inherit from StorageRequestError" %
-                             proto_error)
-            self.assertEqual(proto_error,
-                             errors.error_to_exception(code_error))
+            self.assertIsInstance(
+                proto_error(**REQ_ARGS), errors.StorageRequestError)
+            self.assertEqual(
+                proto_error, errors.error_to_exception(code_error))
 
     def test_quota_exceed_error(self):
         """QuotaExceeded error must have quota info."""

=== modified file 'ubuntuone/storageprotocol/tests/test_hashes.py'
--- tests/test_hashes.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_hashes.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Facundo Batista <[e-mail]>
-#
 # Copyright (C) 2011-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for the protocol hashing methods."""
 
 import hashlib
@@ -42,11 +42,6 @@
     magic_hash_factory,
 )
 
-# let's not get picky about aatributes outside __init__ in tests
-# pylint: disable=W0201
-# it's ok to access internals in the test suite
-# pylint: disable=W0212
-
 
 class FactoriesTest(unittest.TestCase):
     """Test the hasher factories."""
@@ -54,7 +49,7 @@
     def test_content_hash_factory(self):
         """Check the factory for the normal content hash."""
         o = content_hash_factory()
-        self.assertTrue(isinstance(o, SHA1ContentHash))
+        self.assertIsInstance(o, SHA1ContentHash)
 
     def test_content_hash_method(self):
         """Test the method that the normal content hash uses."""
@@ -67,7 +62,7 @@
     def test_magic_hash_factory(self):
         """Check the factory for the magic content hash."""
         o = magic_hash_factory()
-        self.assertTrue(isinstance(o, MagicContentHash))
+        self.assertIsInstance(o, MagicContentHash)
 
     def test_magic_hash_method(self):
         """Test the method that the magic content hash uses."""
@@ -176,7 +171,3 @@
         # the value
         ch = self.hasher.content_hash()
         self.assertRaises(NotImplementedError, pickle.dumps, ch)
-
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'ubuntuone/storageprotocol/tests/test_proxy_tunnel.py'
--- tests/test_proxy_tunnel.py	2016-09-19 02:00:32 +0000
+++ ubuntuone/storageprotocol/tests/test_proxy_tunnel.py	2018-04-08 19:37:28 +0000
@@ -1,6 +1,7 @@
-# Test for proxy tunnel
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -26,9 +27,9 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Test for proxy tunnel"""
-
-import unittest
+
+"""Test for proxy tunnel."""
+
 import base64
 
 from twisted.internet.protocol import Protocol, ClientFactory, connectionDone
@@ -171,8 +172,8 @@
 
     def test_connect_auth(self):
         """Test connecting with auth"""
-        return test_response("HTTP/1.0 200 Connection Made\r\n\r\n",
-            auth="test:test")
+        return test_response(
+            "HTTP/1.0 200 Connection Made\r\n\r\n", auth="test:test")
 
     def test_auth_error(self):
         """Test auth failure"""
@@ -272,12 +273,3 @@
         FakeConnectHTTPS("test", 1, TestClientFactory(),
                          response, peer_callback=peer_callback)
         return d
-
-
-def test_suite():
-    """Test suite"""
-    return unittest.TestLoader().loadTestsFromName(__name__)
-
-
-if __name__ == "__main__":
-    unittest.main()

=== modified file 'ubuntuone/storageprotocol/tests/test_public_file_info.py'
--- tests/test_public_file_info.py	2016-11-07 01:11:29 +0000
+++ ubuntuone/storageprotocol/tests/test_public_file_info.py	2018-04-08 19:37:28 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Copyright 2016 Chicharreros (https://launchpad.net/~chicharreros)
+#
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,

=== modified file 'ubuntuone/storageprotocol/tests/test_putcontent.py'
--- tests/test_putcontent.py	2016-10-11 19:01:04 +0000
+++ ubuntuone/storageprotocol/tests/test_putcontent.py	2018-04-08 19:37:28 +0000
@@ -1,10 +1,7 @@
-# ubuntuone.storageprotocol.tests.test_upload_offset -
-#     tests for the PutContent request
-#
-# Author: John R. Lenton <[e-mail]>
-#         Guillermo Gonzalez <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -30,7 +27,8 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Tests for PutContent request"""
+
+"""Tests for PutContent request."""
 
 import unittest
 

=== modified file 'ubuntuone/storageprotocol/tests/test_query.py'
--- tests/test_query.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_query.py	2018-04-08 19:37:28 +0000
@@ -1,9 +1,7 @@
-# ubuntuone.storageprotocol.tests.test_query -
-#     query tests
-#
-# Author: John R. Lenton <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -29,11 +27,13 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Tests for querying lots of items"""
-
+
+"""Tests for querying lots of items."""
+
+import os
 import unittest
+
 from ubuntuone.storageprotocol.client import MultiQuery
-import os
 
 
 class TestQuery10(unittest.TestCase):
@@ -63,6 +63,3 @@
     Check with even more queries
     """
     N = 1000
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'ubuntuone/storageprotocol/tests/test_request.py'
--- tests/test_request.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_request.py	2018-04-08 19:37:28 +0000
@@ -1,10 +1,7 @@
-# ubuntuone.storageprotocol.tests.test_request -
-#     request class tests
-#
-# Author: Tim Cole <[e-mail]>
-# Author: Natalia Bidart <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -30,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for directory content serialization/unserialization."""
 
 from __future__ import with_statement
@@ -44,9 +42,6 @@
 from ubuntuone.storageprotocol.request import (
     RequestHandler, Request, RequestResponse)
 
-# let's not get picky about attributes outside __init__ in tests
-# pylint: disable=W0201
-
 
 class MindlessRequest(Request):
     """A mindless Request which never actually does anything."""
@@ -118,7 +113,7 @@
         message = protocol_pb2.Message()
         self.request._default_process_message(message)
 
-        self.assertTrue(isinstance(self.error, errors.StorageRequestError))
+        self.assertIsInstance(self.error, errors.StorageRequestError)
         self.assertEqual(self.request, self.error.request)
         self.assertEqual(message, self.error.error_message)
 
@@ -145,8 +140,7 @@
             message.error.type = code_error
             self.request._default_process_message(message)
 
-            self.assertTrue(isinstance(self.error, proto_error),
-                            "must be an instance of %r" % proto_error)
+            self.assertIsInstance(self.error, proto_error)
             self.assertEqual(self.request, self.error.request)
             self.assertEqual(message, self.error.error_message)
 

=== modified file 'ubuntuone/storageprotocol/tests/test_sharersp.py'
--- tests/test_sharersp.py	2012-12-03 19:45:43 +0000
+++ ubuntuone/storageprotocol/tests/test_sharersp.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
-# ubuntuone.storageprotocol.tests.test_sharersp
-#
-# Author: Guillermo Gonzalez <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2010-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for shares response."""
 
 import uuid
@@ -66,7 +66,7 @@
     def test_to_me(self):
         """Test ShareResponse.from_params with a 'to_me' share."""
         args = (uuid.uuid4(), "to_me", uuid.uuid4(), "share_name", u"username",
-            u"visible_name", True, self.access_level)
+                u"visible_name", True, self.access_level)
         share = ShareResponse.from_params(*args)
         self.assertShareResponse(share, args)
 
@@ -116,7 +116,7 @@
     def test_to_me(self):
         """Test ShareResponse.from_params with a 'to_me' share."""
         args = (uuid.uuid4(), "to_me", uuid.uuid4(), "share_name", u"username",
-            u"visible_name", True, self.access_level)
+                u"visible_name", True, self.access_level)
         share = ShareResponse.from_params(*args)
         share.dump_to_msg(self.msg.shares)
         self.assertEqualShare(share,

=== modified file 'ubuntuone/storageprotocol/tests/test_throttling.py'
--- tests/test_throttling.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_throttling.py	2018-04-08 19:37:28 +0000
@@ -1,9 +1,7 @@
-# ubuntuone.storageprotocol.tests.test_throttling -
-#     Throttling tests
-#
-# Author: Facundo Batista <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2012 Canonical
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -29,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for directory content serialization/unserialization."""
 
 from __future__ import with_statement
@@ -232,8 +231,6 @@
 
     def test_change_to_inavlid(self):
         """Test setting invalid limit values after initialization."""
-        # yes, this is a unittest, I need to access protected members
-        # pylint: disable=W0212
         tscf = self.create_factory(True, 2, 2)
         self.assertRaises(ValueError, tscf._set_read_limit, -1)
         self.assertRaises(ValueError, tscf._set_write_limit, -1)
@@ -458,8 +455,8 @@
         self.assertEquals(None, tscf.resetReadThisSecondID)
         self.assertEquals(None, tscf.resetWriteThisSecondID)
         tscf.enable_throttling()
-        self.assertTrue(tscf.throttling_enabled,
-                         "Throttling should be enabled.")
+        self.assertTrue(
+            tscf.throttling_enabled, "Throttling should be enabled.")
         self.assertNotEquals(None, tscf.resetReadThisSecondID)
         self.assertNotEquals(None, tscf.resetWriteThisSecondID)
         tscf.registerRead(3)

=== modified file 'ubuntuone/storageprotocol/tests/test_volumes.py'
--- tests/test_volumes.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/tests/test_volumes.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Natalia B. Bidart <[e-mail]>
-#
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Tests for volume data type."""
 
 import unittest
@@ -37,9 +37,6 @@
 
 from ubuntuone.storageprotocol import protocol_pb2, volumes
 
-# let's not get picky about aatributes outside __init__ in tests
-# pylint: disable=W0201
-
 PATH = u'~/Documents/pdfs/moño/'
 NAME = u'What a beatiful volume'
 VOLUME = uuid.UUID('12345678-1234-1234-1234-123456789abc')
@@ -79,7 +76,7 @@
 
     def test_is_a_volume(self):
         """Test class inheritance."""
-        self.assertTrue(isinstance(self.volume, volumes.Volume))
+        self.assertIsInstance(self.volume, volumes.Volume)
 
     def test_from_params(self):
         """Test creation using from_params."""
@@ -108,7 +105,6 @@
 class ShareTestCase(VolumeTestCase):
     """Check Share data type."""
 
-    # pylint: disable=W0212
     to_me = volumes._direction_prot2nice[protocol_pb2.Shares.TO_ME]
     only_view = volumes._access_prot2nice[protocol_pb2.Shares.VIEW]
 
@@ -133,7 +129,6 @@
     def test_from_msg(self):
         """Test creation using from_msg."""
         message = protocol_pb2.Shares()
-        # pylint: disable=W0201
         message.share_id = str(VOLUME)
         message.subtree = str(NODE)
         message.generation = GENERATION
@@ -161,7 +156,6 @@
     def test_from_msg(self):
         """Test creation using from_msg."""
         message = protocol_pb2.UDFs()
-        # pylint: disable=W0201
         message.volume = str(VOLUME)
         message.node = str(NODE)
         message.suggested_path = PATH
@@ -181,13 +175,8 @@
     def test_from_msg(self):
         """Test creation using from_msg."""
         message = protocol_pb2.Root()
-        # pylint: disable=W0201
         message.node = str(NODE)
         message.generation = GENERATION
         message.free_bytes = FREE_BYTES
         self.volume = self.volume_class.from_msg(message)
         self.assert_correct_attributes()
-
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'ubuntuone/storageprotocol/utils.py'
--- ubuntuone/storageprotocol/utils.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/utils.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
-# ubuntuone.storageprotocol.utils - some storage protocol utils
-#
-# Author: Alejandro J. Cura <[e-mail]>
+# -*- coding: utf-8 -*-
 #
 # Copyright 2011-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,6 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Some storage protocol utils."""
 
 import logging

=== modified file 'ubuntuone/storageprotocol/validators.py'
--- ubuntuone/storageprotocol/validators.py	2012-04-20 22:11:06 +0000
+++ ubuntuone/storageprotocol/validators.py	2018-04-08 19:37:28 +0000
@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -25,10 +27,12 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """Message validation."""
 
 import re
 from uuid import UUID
+
 from google.protobuf.message import Message as _PBMessage
 from google.protobuf.internal.containers import BaseContainer as _PBContainer
 try:
@@ -81,8 +85,8 @@
     """
     # circular import
     from ubuntuone.storageprotocol import request
-    is_valid = a_hash == '' or a_hash == request.UNKNOWN_HASH or \
-               is_valid_sha1(a_hash)
+    is_valid = (a_hash == '' or a_hash == request.UNKNOWN_HASH or
+                is_valid_sha1(a_hash))
     return is_valid
 
 
@@ -90,9 +94,6 @@
     """
     Recursively validate a message's fields
     """
-    # we will import ourselves
-    # pylint: disable=W0406
-
     is_invalid = []
     from ubuntuone.storageprotocol import validators  # this is us!
     for descriptor, submsg in message.ListFields():
@@ -114,9 +115,7 @@
     return is_invalid
 
 
-# these are valid, pylint: disable=C0103
 is_valid_parent_node = is_valid_node
 is_valid_new_parent_node = is_valid_node
 is_valid_subtree = is_valid_node
 is_valid_share_id = is_valid_share
-# pylint: enable=C0103

=== modified file 'ubuntuone/storageprotocol/volumes.py'
--- ubuntuone/storageprotocol/volumes.py	2012-12-03 19:45:43 +0000
+++ ubuntuone/storageprotocol/volumes.py	2018-04-08 19:37:28 +0000
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Author: Natalia B. Bidart <[e-mail]>
-#
 # Copyright 2009-2012 Canonical Ltd.
+# Copyright 2015-2018 Chicharreros (https://launchpad.net/~chicharreros)
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3,
@@ -28,13 +27,13 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
+
 """The volumes abstraction."""
 
 import uuid
 
 from ubuntuone.storageprotocol import protocol_pb2
 
-# these are valid, pylint: disable=C0103
 _direction_prot2nice = {
     protocol_pb2.Shares.FROM_ME: "from_me",
     protocol_pb2.Shares.TO_ME: "to_me",
@@ -46,7 +45,6 @@
     protocol_pb2.Shares.MODIFY: "Modify",
 }
 _access_nice2prot = dict((y, x) for x, y in _access_prot2nice.items())
-# pylint: enable=C0103
 
 
 class Volume(object):