Merge remote-tracking branch 'origin/cloud-storage-api' into cloud-st…

…orage-api
galaxyproject · Mar 30, 2018 · a9d6cab · a9d6cab
2 parents ab8ca70 + a43de58
commit a9d6cab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/galaxy/managers/cloud_storage.py b/lib/galaxy/managers/cloud_storage.py
@@ -2,13 +2,14 @@
 Manager and serializer for cloud-based storages.
 """
 
-import string
-import random
 import logging
 import os
+import random
+import string
+from cgi import FieldStorage
+
 from galaxy.managers import sharable
 from galaxy.util import Params
-from cgi import FieldStorage
 
 try:
     from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList

diff --git a/lib/galaxy/webapps/galaxy/api/cloud_storage.py b/lib/galaxy/webapps/galaxy/api/cloud_storage.py
@@ -6,8 +6,8 @@
 
 from galaxy import exceptions
 from galaxy import web
-from galaxy.web.base.controller import BaseAPIController
 from galaxy.managers import cloud_storage
+from galaxy.web.base.controller import BaseAPIController
 
 log = logging.getLogger(__name__)
 
@@ -109,4 +109,4 @@ def upload(self, trans, payload, **kwargs):
         :param kwargs:
         :return:
         """
-        pass
+        pass