Making new hacking happy

Olivier Gambier · Olivier Gambier · commit 4ff08ca68882 · 2014-08-15T17:47:15.000-07:00
Docker-DCO-1.1-Signed-off-by: Olivier Gambier &lt;olivier@docker.com&gt; (github: dmp42)
diff --git a/docker_registry/app.py b/docker_registry/app.py
@@ -10,10 +10,11 @@
 except ImportError as e:
     _bugsnag_import_error = e
     bugsnag = None
-import flask
 
 from . import toolkit
 from .lib import config
+from .server import __version__
+import flask
 
 # configure logging prior to subsequent imports which assume
 # logging has been configured
@@ -22,8 +23,7 @@
                     level=getattr(logging, cfg.loglevel.upper()),
                     datefmt="%d/%b/%Y:%H:%M:%S %z")
 
-from .lib import mirroring
-from .server import __version__
+from .lib import mirroring  # noqa
 
 app = flask.Flask('docker-registry')
 
diff --git a/docker_registry/index.py b/docker_registry/index.py
@@ -12,7 +12,7 @@
 from .lib import mirroring
 from .lib import signals
 
-from .app import app
+from .app import app  # noqa
 
 
 store = storage.load()
diff --git a/docker_registry/lib/__init__.py b/docker_registry/lib/__init__.py
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/docker_registry/lib/cache.py b/docker_registry/lib/cache.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
+
 import redis
 
 from docker_registry.core import lru
diff --git a/docker_registry/lib/checksums.py b/docker_registry/lib/checksums.py
@@ -82,4 +82,4 @@ def compute_simple(fp, json_data):
     json_data = file(sys.argv[1]).read()
     fp = open(sys.argv[2])
     print(compute_simple(fp, json_data))
-    #print compute_tarsum(fp, json_data)
+    # print compute_tarsum(fp, json_data)
diff --git a/docker_registry/lib/config.py b/docker_registry/lib/config.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+
 import rsa
 import yaml
 
@@ -9,7 +10,8 @@
 
 
 class Config(object):
-    """A simple config class that:
+    """A simple config class
+
      * gives properties access through either items or attributes
      * enforce types (thanks to yaml)
      * interpolate from ENV
diff --git a/docker_registry/lib/index/db.py b/docker_registry/lib/index/db.py
@@ -3,16 +3,15 @@
 """An SQLAlchemy backend for the search endpoint
 """
 
+from ... import storage
+from .. import config
+from . import Index
 import sqlalchemy
 import sqlalchemy.exc
 import sqlalchemy.ext.declarative
 import sqlalchemy.orm
 import sqlalchemy.sql.functions
 
-from ... import storage
-from .. import config
-from . import Index
-
 
 Base = sqlalchemy.ext.declarative.declarative_base()
 
diff --git a/docker_registry/lib/layers.py b/docker_registry/lib/layers.py
@@ -4,6 +4,7 @@
 import tempfile
 
 import backports.lzma as lzma
+
 from docker_registry.core import compat
 json = compat.json
 
@@ -60,6 +61,7 @@ def generate_ancestry(image_id, parent_id=None):
 
 class Archive(lzma.LZMAFile):
     """file-object wrapper for decompressing xz compressed tar archives
+
     This class wraps a file-object that contains tar archive data. The data
     will be optionally decompressed with lzma/xz if found to be a compressed
     archive.
@@ -120,6 +122,7 @@ def json(self):
 
 def serialize_tar_info(tar_info):
     '''serialize a tarfile.TarInfo instance
+
     Take a single tarfile.TarInfo instance and serialize it to a
     tuple. Consider union whiteouts by filename and mark them as
     deleted in the third element. Don't include union metadata
@@ -190,6 +193,7 @@ def get_image_files_from_fobj(layer_file):
 
 def get_image_files_json(image_id):
     '''return json file listing for given image id
+
     Download the specified layer and determine the file contents.
     Alternatively, process a passed in file-object containing the
     layer data.
@@ -212,6 +216,7 @@ def get_image_files_json(image_id):
 
 def get_file_info_map(file_infos):
     '''convert a list of file info tuples to dictionaries
+
     Convert a list of layer file info tuples to a dictionary using the
     first element (filename) as the key.
     '''
@@ -231,6 +236,7 @@ def set_image_diff_cache(image_id, diff_json):
 
 def get_image_diff_json(image_id):
     '''get json describing file differences in layer
+
     Calculate the diff information for the files contained within
     the layer. Return a dictionary of lists grouped by whether they
     were deleted, changed or created in this layer.
diff --git a/docker_registry/lib/mirroring.py b/docker_registry/lib/mirroring.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
-import flask
 import functools
 import logging
-import requests
 
 from .. import storage
 from .. import toolkit
 from . import cache
 from . import config
+import flask
+import requests
 
 logger = logging.getLogger(__name__)
 cfg = config.load()
diff --git a/docker_registry/lib/rlock.py b/docker_registry/lib/rlock.py
@@ -2,9 +2,10 @@
 
 # https://gist.github.com/adewes/6103220
 
-import redis
 import time
 
+import redis
+
 
 class LockTimeout(BaseException):
     pass
diff --git a/docker_registry/lib/rqueue.py b/docker_registry/lib/rqueue.py
@@ -137,6 +137,7 @@ def clear(self):
 
 class CappedCollection(BaseQueue):
     """a bounded queue
+
     Implements a capped collection (the collection never
     gets larger than the specified size).
     """
diff --git a/docker_registry/lib/xtarfile.py b/docker_registry/lib/xtarfile.py
@@ -12,9 +12,7 @@
 
 
 def _proc_pax(self, filetar):
-    """Process an extended or global header as described in
-      POSIX.1-2001.
-   """
+    """Process an extended or global header as described in POSIX.1-2001."""
     # Read the header information.
     buf = filetar.fileobj.read(self._block(self.size))
 
diff --git a/docker_registry/search.py b/docker_registry/search.py
@@ -1,13 +1,11 @@
 # -*- coding: utf-8 -*-
 
-import flask
-import flask_cors
-
-from .lib import config
-from .lib import index
-
 from . import toolkit
 from .app import app
+from .lib import config
+from .lib import index
+import flask
+import flask_cors
 
 
 cfg = config.load()
diff --git a/docker_registry/server/env.py b/docker_registry/server/env.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+
 import yaml
 
 __all__ = ['source']
diff --git a/docker_registry/toolkit.py b/docker_registry/toolkit.py
@@ -161,8 +161,9 @@ def get_remote_ip():
 
 def is_ssl():
     for header in ('X-Forwarded-Proto', 'X-Forwarded-Protocol'):
-        if header in flask.request.headers and \
-                flask.request.headers[header].lower() in ('https', 'ssl'):
+        if header in flask.request.headers and (
+                flask.request.headers[header].lower() in ('https', 'ssl')
+        ):
                     return True
     return False
 
@@ -294,6 +295,6 @@ def get_repository():
 def get_endpoints(overcfg=None):
     registry_endpoints = (overcfg or cfg).registry_endpoints
     if not registry_endpoints:
-        #registry_endpoints = socket.gethostname()
+        # registry_endpoints = socket.gethostname()
         registry_endpoints = flask.request.environ['HTTP_HOST']
     return registry_endpoints
diff --git a/docker_registry/wsgi.py b/docker_registry/wsgi.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from .server import env
 import logging
 
+from .server import env
+
 _new_relic_ini = env.source('NEW_RELIC_INI')
 if _new_relic_ini:
     try:
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,3 +1,4 @@
 coverage>=3.7,<4.0
 mock>=1.0,<2.0
 nose>=1.3,<2.0
+six>=1.6,<2.0
diff --git a/scripts/bandwidth_parser.py b/scripts/bandwidth_parser.py
@@ -4,9 +4,10 @@
 import json
 import logging
 import re
-import redis
 import sys
 
+import redis
+
 logging.basicConfig(format='%(asctime)s %(levelname)s: %(message)s',
                     level=logging.INFO)
 logger = logging.getLogger('metrics')
@@ -213,20 +214,21 @@ def generate_bandwidth_data(start_time, min_time, time_interval):
                                    num_items)
                     if not most_recent_parsing:
                         most_recent_parsing = str_end_time
-                    time_interval, items = \
+                    time_interval, items = (
                         update_current_interval(items,
                                                 logging_interval,
                                                 start_time)
+                    )
                 else:
-                    time_interval, items = \
+                    time_interval, items = (
                         adjust_current_interval(time_interval,
                                                 end_time,
                                                 items)
-            bandwidth_items[time_interval] = \
-                bandwidth_items.get(time_interval, 0.0) \
-                + bandwidth
-            num_items[time_interval] = \
-                num_items.get(time_interval, 0.0) + 1
+                    )
+            bandwidth_items[time_interval] = (
+                bandwidth_items.get(time_interval, 0.0) + bandwidth
+            )
+            num_items[time_interval] = num_items.get(time_interval, 0.0) + 1
             end_times.pop(key, None)
     if most_recent_parsing:
         save_last_line_parsed(most_recent_parsing)
diff --git a/scripts/diff-worker.py b/scripts/diff-worker.py
@@ -60,6 +60,7 @@ def get_redis_connection(options):
 
 def handle_request(layer_id, redis_conn):
     '''handler for any item pulled from worker job queue
+
     This handler is called every time the worker is able to pop a message
     from the job queue filled by the registry. The worker blocks until a
     message is available. This handler will then attempt to aquire a lock
diff --git a/tests/lib/index/test__init__.py b/tests/lib/index/test__init__.py
@@ -1,6 +1,7 @@
-import mock
 import unittest
 
+import mock
+
 from docker_registry.lib import index
 
 
diff --git a/tests/lib/index/test_db.py b/tests/lib/index/test_db.py
@@ -1,6 +1,7 @@
-import mock
 import unittest
 
+import mock
+
 from docker_registry.lib.index import db
 
 
diff --git a/tests/mock_s3.py b/tests/mock_s3.py
@@ -3,13 +3,15 @@
 '''Monkeypatch s3 Storage preventing parallel key stream read in unittesting.
    It is called from lib/storage/s3'''
 
+import six
+
 from docker_registry.core import exceptions
 import docker_registry.drivers.s3 as s3
 from docker_registry.testing import utils
 
 
+@six.add_metaclass(utils.monkeypatch_class)
 class Storage(s3.Storage):
-    __metaclass__ = utils.monkeypatch_class
 
     # def stream_read(self, path, bytes_range=None):
     #     path = self._init_path(path)
diff --git a/tests/test_all_installed_drivers.py b/tests/test_all_installed_drivers.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from docker_registry.core import driver as driveengine
-
 from docker_registry import testing
 # Mock any boto
 from docker_registry.testing import mock_boto  # noqa
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -5,10 +5,11 @@
 # from docker_registry.core import exceptions
 # import docker_registry.testing as testing
 
-import mock
 import os
 import unittest
 
+import mock
+
 from docker_registry.lib import config
 
 
diff --git a/tests/test_images.py b/tests/test_images.py
@@ -5,6 +5,8 @@
 import base
 
 from docker_registry.core import compat
+import docker_registry.images as images
+
 json = compat.json
 
 
@@ -22,17 +24,14 @@ def test_nginx_accel_redirect_layer(self):
         layer_data = self.gen_random_string(1024)
         self.upload_image(image_id, parent_id=None, layer=layer_data)
 
-        import docker_registry.images as images
-
         # ensure the storage mechanism is LocalStorage or this test is bad
         self.assertTrue(images.store.scheme == 'file',
                         'Store must be LocalStorage')
 
         # set the nginx accel config
         accel_header = 'X-Accel-Redirect'
         accel_prefix = '/registry'
-        images.cfg._config['nginx_x_accel_redirect'] \
-            = accel_prefix
+        images.cfg._config['nginx_x_accel_redirect'] = accel_prefix
 
         layer_path = 'images/{0}/layer'.format(image_id)
 
diff --git a/tests/test_index.py b/tests/test_index.py
@@ -8,8 +8,9 @@
 
 class TestIndex(base.TestCase):
 
-    """The Index module is fake at the moment, hence the unit tests only
-       test the return codes
+    """The Index module is fake at the moment
+
+    hence the unit tests only test the return codes
     """
 
     def test_users(self):
diff --git a/tests/test_layers.py b/tests/test_layers.py
diff --git a/tests/test_s3.py b/tests/test_s3.py
diff --git a/tests/test_tags.py b/tests/test_tags.py
diff --git a/tests/test_tarfile.py b/tests/test_tarfile.py
