Fixed linting errors

cloudbridge/cloud/base/services.py

@@ -12,8 +12,8 @@ from cloudbridge.cloud.interfaces.exceptions import \
     InvalidConfigurationException
 from cloudbridge.cloud.interfaces.resources import Network
 from cloudbridge.cloud.interfaces.resources import Router
-from cloudbridge.cloud.interfaces.services import BucketService
 from cloudbridge.cloud.interfaces.services import BucketObjectService
+from cloudbridge.cloud.interfaces.services import BucketService
 from cloudbridge.cloud.interfaces.services import CloudService
 from cloudbridge.cloud.interfaces.services import ComputeService
 from cloudbridge.cloud.interfaces.services import ImageService
@@ -50,11 +50,9 @@ class BaseCloudService(CloudService):
     def _generate_event_name(self, func_name):
         return ".".join((self._service_event_name, func_name))
 
-    def subscribe(self, func_name, priority, callback,
-                  result_callback=False):
+    def subscribe(self, func_name, priority, callback):
         event_name = self._generate_event_name(func_name)
-        self.provider.events.subscribe(event_name, priority, callback,
-                                       result_callback)
+        self.provider.events.subscribe(event_name, priority, callback)
 
     def check_initialized(self, func_name):
         event_name = self._generate_event_name(func_name)
@@ -158,7 +156,7 @@ class BaseBucketService(
             log.debug("Returned bucket object: {}".format(callback_result))
 
         self.subscribe("get", 2000, _get_pre_log)
-        self.subscribe("get", 3000, _get_post_log, result_callback=True)
+        self.subscribe("get", 3000, _get_post_log)
         self.mark_initialized("get")
 
     def _init_find(self):
@@ -170,8 +168,7 @@ class BaseBucketService(
             log.debug("Returned bucket objects: {}".format(callback_result))
 
         self.subscribe("find", 2000, _find_pre_log)
-        self.subscribe("find", 3000, _find_post_log,
-                       result_callback=True)
+        self.subscribe("find", 3000, _find_post_log)
         self.mark_initialized("find")
 
     def _init_list(self):
@@ -188,8 +185,7 @@ class BaseBucketService(
                     "Returned bucket objects: {}".format(callback_result))
 
             self.subscribe("list", 2000, _list_pre_log)
-            self.subscribe("list", 3000, _list_post_log,
-                           result_callback=True)
+            self.subscribe("list", 3000, _list_post_log)
             self.mark_initialized("list")
 
     def _init_create(self):
@@ -204,8 +200,7 @@ class BaseBucketService(
             log.debug("Returned bucket object: {}".format(callback_result))
 
         self.subscribe("create", 2000, _create_pre_log)
-        self.subscribe("create", 3000, _create_post_log,
-                       result_callback=True)
+        self.subscribe("create", 3000, _create_post_log)
         self.mark_initialized("create")
 
     def get(self, bucket_id):

cloudbridge/cloud/interfaces/exceptions.py

@@ -96,8 +96,6 @@ class DuplicateResourceException(CloudBridgeBaseException):
 
 class HandlerException(CloudBridgeBaseException):
     """
-    Marker interface for object wait exceptions.
-    Thrown when a timeout or errors occurs waiting for an object does not reach
-    the expected state within a specified time limit.
+    Marker interface for event handler exceptions.
     """
     pass

cloudbridge/cloud/interfaces/provider.py

@@ -253,4 +253,4 @@ class HandlerType(Enum):
     Handler Types.
     """
     SUBSCRIPTION = 'subscription'
-    INTERCEPTION = 'intercept'
+    INTERCEPTION = 'intercept'

cloudbridge/cloud/providers/aws/resources.py

@@ -7,7 +7,6 @@ import logging
 
 from botocore.exceptions import ClientError
 
-import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import BaseAttachmentInfo
 from cloudbridge.cloud.base.resources import BaseBucket
 from cloudbridge.cloud.base.resources import BaseBucketContainer

cloudbridge/cloud/providers/aws/services.py

@@ -11,8 +11,8 @@ import requests
 
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.services import BaseBucketService
 from cloudbridge.cloud.base.services import BaseBucketObjectService
+from cloudbridge.cloud.base.services import BaseBucketService
 from cloudbridge.cloud.base.services import BaseComputeService
 from cloudbridge.cloud.base.services import BaseImageService
 from cloudbridge.cloud.base.services import BaseInstanceService

cloudbridge/cloud/providers/azure/resources.py

@@ -13,7 +13,6 @@ from msrestazure.azure_exceptions import CloudError
 
 import pysftp
 
-import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import BaseAttachmentInfo, \
     BaseBucket, BaseBucketContainer, BaseBucketObject, BaseFloatingIP, \
     BaseFloatingIPContainer, BaseGatewayContainer, BaseInstance, \

cloudbridge/cloud/providers/azure/services.py

@@ -10,8 +10,8 @@ from msrestazure.azure_exceptions import CloudError
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import ClientPagedResultList, \
     ServerPagedResultList
-from cloudbridge.cloud.base.services import BaseBucketService, \
-    BaseBucketObjectService, BaseComputeService, \
+from cloudbridge.cloud.base.services import BaseBucketObjectService, \
+    BaseBucketService, BaseComputeService, \
     BaseImageService, BaseInstanceService, BaseKeyPairService, \
     BaseNetworkService, BaseNetworkingService, BaseRegionService, \
     BaseRouterService, BaseSecurityService, BaseSnapshotService, \
@@ -428,8 +428,8 @@ class AzureBucketObjectService(BaseBucketObjectService):
 
     def find(self, bucket, **kwargs):
         obj_list = [AzureBucketObject(self.provider, bucket, obj)
-                   for obj in
-                   self.provider.azure_client.list_blobs(bucket.name)]
+                    for obj in
+                    self.provider.azure_client.list_blobs(bucket.name)]
         filters = ['name']
         matches = cb_helpers.generic_find(filters, kwargs, obj_list)
         return ClientPagedResultList(self.provider, list(matches))

cloudbridge/cloud/providers/openstack/resources.py

@@ -60,7 +60,6 @@ from cloudbridge.cloud.interfaces.resources import SnapshotState
 from cloudbridge.cloud.interfaces.resources import SubnetState
 from cloudbridge.cloud.interfaces.resources import TrafficDirection
 from cloudbridge.cloud.interfaces.resources import VolumeState
-from cloudbridge.cloud.providers.openstack import helpers as oshelpers
 
 ONE_GIG = 1048576000  # in bytes
 FIVE_GIG = ONE_GIG * 5  # in bytes

cloudbridge/cloud/providers/openstack/services.py

@@ -17,8 +17,8 @@ from swiftclient import ClientException as SwiftClientException
 import cloudbridge.cloud.base.helpers as cb_helpers
 from cloudbridge.cloud.base.resources import BaseLaunchConfig
 from cloudbridge.cloud.base.resources import ClientPagedResultList
-from cloudbridge.cloud.base.services import BaseBucketService
 from cloudbridge.cloud.base.services import BaseBucketObjectService
+from cloudbridge.cloud.base.services import BaseBucketService
 from cloudbridge.cloud.base.services import BaseComputeService
 from cloudbridge.cloud.base.services import BaseImageService
 from cloudbridge.cloud.base.services import BaseInstanceService