Fix breakage introduced by hacking cleanup

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

Author: Olivier Gambier

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

@@ -23,7 +23,7 @@
 import boto.s3.bucket
 import boto.s3.connection
 import boto.s3.key
-import six.add_metaclass
+import six
 
 Bucket__init__ = boto.s3.bucket.Bucket.__init__
 

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

@@ -28,7 +28,7 @@ def monkeypatch_class(name, bases, namespace):
     assert len(bases) == 1, "Exactly one base class required"
     base = bases[0]
     for name, value in namespace.iteritems():
-        if name != "__metaclass__":
+        if name != "__metaclass__" and name != "__doc__":
             setattr(base, name, value)
     return base