Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-24 08:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] attachment_swift: fix imports

Browse Source
This commit is contained in:
sebalix
2020-03-05 17:20:38 +01:00
parent ae2e109ea6
commit f3efd19a29
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_swift/__openerp__.py
+1
View File
@@ -13,6 +13,7 @@
'external_dependencies': { 'external_dependencies': {
'python': ['swiftclient', 'python': ['swiftclient',
'keystoneclient', 'keystoneclient',
'keystoneauth1',
], ],
}, },
'website': 'https://www.camptocamp.com', 'website': 'https://www.camptocamp.com',
attachment_swift/models/ir_attachment.py
+4 -1
View File
@@ -17,9 +17,12 @@ _logger = logging.getLogger(__name__)
try: try:
import swiftclient import swiftclient
import keystoneauth1 import keystoneauth1
from keystoneauth1 import identity
from swiftclient.exceptions import ClientException from swiftclient.exceptions import ClientException
except ImportError: except ImportError:
swiftclient = None swiftclient = None
keystoneauth1 = None
identity = None
ClientException = None ClientException = None
_logger.debug("Cannot 'import swiftclient'.") _logger.debug("Cannot 'import swiftclient'.")
@@ -55,7 +58,7 @@ class SwiftSessionStore(object):
key = self._get_key(auth_url, username, password, project_name) key = self._get_key(auth_url, username, password, project_name)
session = self._sessions.get(key) session = self._sessions.get(key)
if not session: if not session:
auth = keystoneauth1.identity.v3.Password( auth = identity.v3.Password(
username=username, username=username,
password=password, password=password,
project_name=project_name, project_name=project_name,