diff --git a/document_sftp/document_sftp_handle.py b/document_sftp/document_sftp_handle.py index a5e0b53c..f4f39189 100644 --- a/document_sftp/document_sftp_handle.py +++ b/document_sftp/document_sftp_handle.py @@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from paramiko import SFTP_EOF, SFTPHandle +try: + from paramiko import SFTP_EOF, SFTPHandle +except ImportError: + pass from base64 import b64decode @@ -14,6 +17,7 @@ class DocumentSFTPHandle(SFTPHandle): return self.attachment.env['document.sftp.root']._file(self.attachment) def read(self, offset, length): + # pylint: disable=W8106 data = b64decode(self.attachment.datas) if offset > len(data): return SFTP_EOF diff --git a/document_sftp/document_sftp_server.py b/document_sftp/document_sftp_server.py index 383ac6e8..588d54f0 100644 --- a/document_sftp/document_sftp_server.py +++ b/document_sftp/document_sftp_server.py @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from paramiko import AUTH_SUCCESSFUL, AUTH_FAILED,\ - OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED, OPEN_SUCCEEDED,\ - RSAKey, ServerInterface -from paramiko.py3compat import decodebytes +try: + from paramiko import AUTH_SUCCESSFUL, AUTH_FAILED,\ + OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED, OPEN_SUCCEEDED,\ + RSAKey, ServerInterface + from paramiko.py3compat import decodebytes +except ImportError: + pass from openerp.exceptions import AccessDenied diff --git a/document_sftp/document_sftp_sftp_server.py b/document_sftp/document_sftp_sftp_server.py index ed4e7597..a610cb54 100644 --- a/document_sftp/document_sftp_sftp_server.py +++ b/document_sftp/document_sftp_sftp_server.py @@ -1,7 +1,11 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from paramiko import SFTP_PERMISSION_DENIED, SFTPServerInterface, SFTPServer +try: + from paramiko import SFTP_PERMISSION_DENIED, SFTPServerInterface,\ + SFTPServer +except ImportError: + pass from openerp import api diff --git a/document_sftp/document_sftp_transport.py b/document_sftp/document_sftp_transport.py index 8e5f0b8f..898b3c03 100644 --- a/document_sftp/document_sftp_transport.py +++ b/document_sftp/document_sftp_transport.py @@ -1,8 +1,11 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from paramiko import Transport -from paramiko.transport import DEFAULT_WINDOW_SIZE, DEFAULT_MAX_PACKET_SIZE +try: + from paramiko import Transport + from paramiko.transport import DEFAULT_WINDOW_SIZE, DEFAULT_MAX_PACKET_SIZE +except ImportError: + pass from openerp import api, SUPERUSER_ID from openerp.modules.registry import RegistryManager diff --git a/document_sftp/tests/test_document_sftp.py b/document_sftp/tests/test_document_sftp.py index 0dfedb27..24a7e8bc 100644 --- a/document_sftp/tests/test_document_sftp.py +++ b/document_sftp/tests/test_document_sftp.py @@ -6,7 +6,7 @@ import paramiko from openerp import tools from openerp.modules.registry import RegistryManager from openerp.tests.common import TransactionCase -from openerp.addons.document_sftp.models.document_sftp import _db2thread +from ..models.document_sftp import _db2thread from ..hooks import post_init_hook