Refactor the util directory to use subpackages.

util/config/validator.py

@@ -16,7 +16,7 @@ from flask.ext.mail import Mail, Message
 from data.database import validate_database_url, User
 from storage import get_storage_driver
 from auth.auth_context import get_authenticated_user
-from util.oauth import GoogleOAuthConfig, GithubOAuthConfig, GitLabOAuthConfig
+from util.config.oauth import GoogleOAuthConfig, GithubOAuthConfig, GitLabOAuthConfig
 from bitbucket import BitBucket
 
 from app import app, CONFIG_PROVIDER, get_app_url, OVERRIDE_CONFIG_DIRECTORY

util/migrate/uncompressedsize.py

@@ -5,7 +5,7 @@ from data import model
 from data.database import ImageStorage
 from app import app, storage as store
 from data.database import db, db_random_func
-from util.gzipstream import ZLIB_GZIP_WINDOW
+from util.registry.gzipstream import ZLIB_GZIP_WINDOW
 
 
 logger = logging.getLogger(__name__)

util/registry/changes.py

@@ -1,7 +1,7 @@
 import marisa_trie
 import os
 import tarfile
-from aufs import is_aufs_metadata, get_deleted_prefix
+from util.registry.aufs import is_aufs_metadata, get_deleted_prefix
 
 ALLOWED_TYPES = {tarfile.REGTYPE, tarfile.AREGTYPE}
 

util/registry/streamlayerformat.py

@@ -1,8 +1,7 @@
 import marisa_trie
 import os
-import tarfile
-from aufs import is_aufs_metadata, get_deleted_prefix
-from util.tarlayerformat import TarLayerFormat
+from util.registry.aufs import is_aufs_metadata, get_deleted_prefix
+from util.registry.tarlayerformat import TarLayerFormat
 
 AUFS_METADATA = u'.wh..wh.'
 

util/registry/tarfileappender.py

@@ -2,8 +2,8 @@ import tarfile
 
 from cStringIO import StringIO
 
-from util.tarlayerformat import TarLayerFormat
-from util.gzipwrap import GzipWrap
+from util.registry.tarlayerformat import TarLayerFormat
+from util.registry.gzipwrap import GzipWrap
 
 class TarfileAppender(TarLayerFormat):
   """ Helper class which allows for appending entries to a gzipped-tarfile and doing so

util/saas/queuemetrics.py

@@ -1,6 +1,6 @@
 import logging
 
-from util.cloudwatch import get_queue
+from util.saas.cloudwatch import get_queue
 
 
 logger = logging.getLogger(__name__)