Make the new "hacking" version happy

Docker-DCO-1.1-Signed-off-by: Olivier Gambier <[email protected]> (github: dmp42)

Author: Olivier Gambier

depends/docker-registry-core/docker_registry/core/boto.py

@@ -37,7 +37,6 @@
 
 from . import driver
 from . import lru
-
 from .exceptions import FileNotFoundError
 
 logger = logging.getLogger(__name__)

depends/docker-registry-core/docker_registry/core/driver.py

@@ -41,8 +41,9 @@
 
 class Base(object):
 
-    """Storage is a convenience class that describes methods that must be
-    implemented by any backend.
+    """Storage is a convenience class...
+
+    ... that describes methods that must be implemented by any backend.
     You should inherit (or duck type) this if you are implementing your own.
 
     :param host: host name
@@ -157,60 +158,52 @@ def put_bytes(self, path, content):
         return self.put_content(path, content)
 
     def get_content(self, path):
-        """Method to get content
-        """
+        """Method to get content."""
         raise NotImplementedError(
             "You must implement get_content(self, path) on your storage %s" %
             self.__class__.__name__)
 
     def put_content(self, path, content):
-        """Method to put content
-        """
+        """Method to put content."""
         raise NotImplementedError(
             "You must implement put_content(self, path, content) on %s" %
             self.__class__.__name__)
 
     def stream_read(self, path, bytes_range=None):
-        """Method to stream read
-        """
+        """Method to stream read."""
         raise NotImplementedError(
             "You must implement stream_read(self, path, , bytes_range=None) " +
             "on your storage %s" %
             self.__class__.__name__)
 
     def stream_write(self, path, fp):
-        """Method to stream write
-        """
+        """Method to stream write."""
         raise NotImplementedError(
             "You must implement stream_write(self, path, fp) " +
             "on your storage %s" %
             self.__class__.__name__)
 
     def list_directory(self, path=None):
-        """Method to list directory
-        """
+        """Method to list directory."""
         raise NotImplementedError(
             "You must implement list_directory(self, path=None) " +
             "on your storage %s" %
             self.__class__.__name__)
 
     def exists(self, path):
-        """Method to test exists
-        """
+        """Method to test exists."""
         raise NotImplementedError(
             "You must implement exists(self, path) on your storage %s" %
             self.__class__.__name__)
 
     def remove(self, path):
-        """Method to remove
-        """
+        """Method to remove."""
         raise NotImplementedError(
             "You must implement remove(self, path) on your storage %s" %
             self.__class__.__name__)
 
     def get_size(self, path):
-        """Method to get the size
-        """
+        """Method to get the size."""
         raise NotImplementedError(
             "You must implement get_size(self, path) on your storage %s" %
             self.__class__.__name__)

depends/docker-registry-core/docker_registry/core/exceptions.py

@@ -34,8 +34,7 @@
 
 class UnspecifiedError(Exception):
 
-    """Base class for all exceptions in docker_registry
-    """
+    """Base class for all exceptions in docker_registry."""
 
     def __init__(self, *args, **kwargs):
         self.message = kwargs.pop('message', 'No details')
@@ -44,8 +43,9 @@ def __init__(self, *args, **kwargs):
 
 class UsageError(UnspecifiedError):
 
-    """Exceptions related to use of the library, like missing files,
-    wrong argument type, etc.
+    """Exceptions related to use of the library.
+
+    Missing files, wrong argument type, etc.
     """
 
 

depends/docker-registry-core/docker_registry/core/lru.py

@@ -26,8 +26,8 @@
 
 import functools
 import logging
-import redis
 
+import redis
 logger = logging.getLogger(__name__)
 
 redis_conn = None

depends/docker-registry-core/docker_registry/testing/driver.py

@@ -19,11 +19,10 @@
 import random
 import string
 
-from nose import tools
-
 from ..core import compat
 from ..core import driver
 from ..core import exceptions
+from nose import tools
 
 logger = logging.getLogger(__name__)
 

depends/docker-registry-core/docker_registry/testing/mock_boto.py

@@ -18,18 +18,18 @@
 XXX this mock is crass and break gcs.
 Look into moto instead.'''
 
+from . import mock_dict
+from . import utils
 import boto.s3.bucket
 import boto.s3.connection
 import boto.s3.key
-
-from . import mock_dict
-from . import utils
+import six.add_metaclass
 
 Bucket__init__ = boto.s3.bucket.Bucket.__init__
 
 
+@six.add_metaclass(utils.monkeypatch_class)
 class MultiPartUpload(boto.s3.multipart.MultiPartUpload):
-    __metaclass__ = utils.monkeypatch_class
 
     def upload_part_from_file(self, io, num_part):
         if num_part == 1:
@@ -41,8 +41,8 @@ def complete_upload(self):
         return None
 
 
+@six.add_metaclass(utils.monkeypatch_class)
 class S3Connection(boto.s3.connection.S3Connection):
-    __metaclass__ = utils.monkeypatch_class
 
     def __init__(self, *args, **kwargs):
         return None
@@ -56,8 +56,8 @@ def make_request(self, *args, **kwargs):
         return 'request result'
 
 
+@six.add_metaclass(utils.monkeypatch_class)
 class Bucket(boto.s3.bucket.Bucket):
-    __metaclass__ = utils.monkeypatch_class
 
     _bucket = mock_dict.MockDict()
     _bucket.add_dict_methods()
@@ -96,8 +96,8 @@ def initiate_multipart_upload(self, key_name, **kwargs):
         return mp
 
 
+@six.add_metaclass(utils.monkeypatch_class)
 class Key(boto.s3.key.Key):
-    __metaclass__ = utils.monkeypatch_class
 
     def exists(self):
         bucket_dict = self.bucket._bucket_dict

depends/docker-registry-core/docker_registry/testing/query.py

@@ -14,10 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from nose import tools
-
 from ..core import driver
 from ..core import exceptions
+from nose import tools
 
 
 class Query(object):

depends/docker-registry-core/requirements/style.txt

@@ -1 +1 @@
-hacking==0.8.1
+hacking>=0.8,<1.0