openstack/cinder
Code Issues Proposed changes

Merge "DataCore: get rid of pylint errors due to contextlib"

Browse Source
This commit is contained in:
Zuul 2018-06-23 02:19:20 +00:00 committed by Gerrit Code Review
commit 89140dddfc
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/volume/drivers/datacore/test_datacore_passwd.py
View File

@ -51,6 +51,12 @@ class FakeFileStorage(object):
def close(self):
pass
def __enter__(self):
return self
def __exit__(self, type, value, traceback):
self.close()
class PasswordFileStorageTestCase(test.TestCase):
"""Tests for the password storage."""

13
cinder/volume/drivers/datacore/passwd.py
View File

@ -14,7 +14,6 @@
"""Password storage."""
import contextlib
import json
import os
import stat
@ -93,6 +92,12 @@ class FileStorage(object):
self._file.close()
self._file = None
def __enter__(self):
return self
def __exit__(self, type, value, traceback):
self.close()
class PasswordFileStorage(object):
"""Password storage implementation.
@ -116,7 +121,7 @@ class PasswordFileStorage(object):
@cinder_utils.synchronized(
'datacore-password_storage-' + self._file_path, external=True)
def _set_password():
with contextlib.closing(self._file_storage.open()) as storage:
with self._file_storage.open() as storage:
passwords = storage.load()
if resource not in passwords:
passwords[resource] = {}
@ -138,7 +143,7 @@ class PasswordFileStorage(object):
@cinder_utils.synchronized(
'datacore-password_storage-' + self._file_path, external=True)
def _get_password():
with contextlib.closing(self._file_storage.open()) as storage:
with self._file_storage.open() as storage:
passwords = storage.load()
if resource in passwords:
return passwords[resource].get(username)
@ -155,7 +160,7 @@ class PasswordFileStorage(object):
@cinder_utils.synchronized(
'datacore-password_storage-' + self._file_path, external=True)
def _delete_password():
with contextlib.closing(self._file_storage.open()) as storage:
with self._file_storage.open() as storage:
passwords = storage.load()
if resource in passwords and username in passwords[resource]:
del passwords[resource][username]