resolve regression in edge filer browser exceptions

Author: saimonation

cterasdk/cio/edge.py

@@ -6,7 +6,7 @@
 from ..objects.uri import unquote
 from . import common
 from ..exceptions.transport import HTTPError
-from ..exceptions.io import ResourceExistsError, RestrictedPathError
+from ..exceptions.io import ResourceExistsError, RestrictedPathError, RemoteStorageError
 
 
 logger = logging.getLogger('cterasdk.edge')
@@ -70,7 +70,7 @@ def makedir(path):
         yield path.absolute
     except HTTPError as error:
         try:
-            accept_error(error.response.message.msg, directory)
+            accept_error(error.error.response.error.msg, path=directory)
         except ResourceExistsError:
             logger.info('Directory already exists: %s', directory)
     logger.info('Directory created: %s', directory)
@@ -127,17 +127,27 @@ def upload(name, destination, fd):
     yield param
 
 
-def accept_error(response, reference):
-    error = {
-        "File exists": ResourceExistsError(),
-        "Creating a folder in this location is forbidden": RestrictedPathError(),
-    }.get(response, None)
-    try:
-        if error:
+file_access_errors = {
+    "File exists": ResourceExistsError,
+    "Creating a folder in this location is forbidden": RestrictedPathError
+}
+
+
+def accept_error(error_message, **kwargs):
+    """
+    Check if response contains an error.
+    """
+    if error_message not in ['OK']:
+        exception_classname = file_access_errors.get(error_message, RemoteStorageError)
+        try:
+            if exception_classname:
+                raise exception_classname(**kwargs)
+        except ResourceExistsError as error:
+            logger.warning('Resource already exists: a file or folder with this name already exists.')
+            raise error
+        except RestrictedPathError as error:
+            logger.error('Creating a folder in the specified location is forbidden.')
+            raise error
+        except RemoteStorageError as error:
+            logger.error('An error occurred while performing operation.')
             raise error
-    except ResourceExistsError as error:
-        logger.warning('Resource already exists: a file or folder with this name already exists. %s', {'path': reference})
-        raise error
-    except RestrictedPathError as error:
-        logger.error('Creating a folder in the specified location is forbidden. %s', {'name': reference})
-        raise error

cterasdk/clients/clients.py

@@ -273,7 +273,7 @@ def propfind(self, path, depth, **kwargs):
     def mkcol(self, path, **kwargs):
         request = async_requests.MkcolRequest(self._builder(path), **kwargs)
         response = self.request(request, on_error=XMLHandler())
-        return response.text()
+        return response.xml()
 
     @decorators.authenticated
     def copy(self, source, destination, *, overwrite=False, **kwargs):

cterasdk/clients/errors.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from http import HTTPStatus
 from ..exceptions.transport import (
-    BadRequest, Unauthorized, Forbidden, NotFound, Unprocessable,
+    BadRequest, Unauthorized, Forbidden, NotFound, NotAllowed, PreConditionFailed, Unprocessable,
     InternalServerError, BadGateway, ServiceUnavailable, GatewayTimeout, HTTPError
 )
 from ..common import Object
@@ -67,6 +67,8 @@ def raise_error(status, error):
         HTTPStatus.UNAUTHORIZED: Unauthorized,
         HTTPStatus.FORBIDDEN: Forbidden,
         HTTPStatus.NOT_FOUND: NotFound,
+        HTTPStatus.METHOD_NOT_ALLOWED: NotAllowed,
+        HTTPStatus.PRECONDITION_FAILED: PreConditionFailed,
         HTTPStatus.UNPROCESSABLE_ENTITY: Unprocessable,
         HTTPStatus.INTERNAL_SERVER_ERROR: InternalServerError,
         HTTPStatus.BAD_GATEWAY: BadGateway,

cterasdk/exceptions/io.py

@@ -50,8 +50,8 @@ def __init__(self, path):
 
 class RestrictedPathError(RemoteStorageError):
 
-    def __init__(self):
-        super().__init__('Creating a folder in the specified location is forbidden.')
+    def __init__(self, path):
+        super().__init__('Creating a folder in the specified location is forbidden.', path)
 
 
 class RestrictedRoot(RemoteStorageError):

cterasdk/exceptions/transport.py

@@ -19,117 +19,66 @@ def __init__(self, status, error):
 
 
 class BadRequest(HTTPError):
-    """
-    Bad Request
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.BAD_REQUEST, error)
 
 
 class Unauthorized(HTTPError):
-    """
-    Unauthorized
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.UNAUTHORIZED, error)
 
 
 class Forbidden(HTTPError):
-    """
-    Unauthorized
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.FORBIDDEN, error)
 
 
 class NotFound(HTTPError):
-    """
-    NotFound
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.NOT_FOUND, error)
 
 
-class Unprocessable(HTTPError):
-    """
-    Unprocessable
+class NotAllowed(HTTPError):
 
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
+    def __init__(self, error):
+        super().__init__(HTTPStatus.METHOD_NOT_ALLOWED, error)
+
+
+class PreConditionFailed(HTTPError):
+
+    def __init__(self, error):
+        super().__init__(HTTPStatus.PRECONDITION_FAILED, error)
+
+
+class Unprocessable(HTTPError):
 
     def __init__(self, error):
         super().__init__(HTTPStatus.UNPROCESSABLE_ENTITY, error)
 
 
 class InternalServerError(HTTPError):
-    """
-    InternalServerError
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.INTERNAL_SERVER_ERROR, error)
 
 
 class BadGateway(HTTPError):
-    """
-    BadGateway
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.BAD_GATEWAY, error)
 
 
 class ServiceUnavailable(HTTPError):
-    """
-    ServiceUnavailable
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.SERVICE_UNAVAILABLE, error)
 
 
 class GatewayTimeout(HTTPError):
-    """
-    GatewayTimeout
-
-    :ivar int code: Status code
-    :ivar str name: Reason
-    :ivar cterasdk.clients.errors.Error error: Error object
-    """
 
     def __init__(self, error):
         super().__init__(HTTPStatus.GATEWAY_TIMEOUT, error)