openstack
/
glance_store
Code Issues Proposed changes

Fix defaults for ConfigParser 

As of 3.7, the configparser module will not allow defaults values to be None.
This patch replaces such values with "default".

Change-Id: Id5a414412cd66d479fb8f8784cba5deddc628dfd
Closes-Bug: #1785641
This commit is contained in:
Cyril Roelandt 2018-09-04 18:47:31 +02:00
parent 11db636c34
commit 6ce857397d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glance_store/_drivers/swift/utils.py
View File

@ -100,9 +100,9 @@ Related options:
]
_config_defaults = {'user_domain_id': 'default',
'user_domain_name': None,
'user_domain_name': 'default',
'project_domain_id': 'default',
'project_domain_name': None}
'project_domain_name': 'default'}
if sys.version_info >= (3, 2):
CONFIG = configparser.ConfigParser(defaults=_config_defaults)

4
glance_store/tests/unit/test_swift_store.py
View File

@ -1400,8 +1400,8 @@ class TestStoreAuthV3(TestStoreAuthV1):
auth_url=loc.store_location.swift_url + '/',
username=username, password="key",
project_name=tenant,
project_domain_id='default', project_domain_name=None,
user_domain_id='default', user_domain_name=None,)
project_domain_id='default', project_domain_name='default',
user_domain_id='default', user_domain_name='default',)
mock_session.Session.assert_called_once_with(
auth=mock_identity.V3Password(), verify=True)
mock_client.Client.assert_called_once_with(

4
glance_store/tests/unit/test_swift_store_multibackend.py
View File

@ -1446,8 +1446,8 @@ class TestStoreAuthV3(TestStoreAuthV1):
auth_url=loc.store_location.swift_url + '/',
username=username, password="key",
project_name=tenant,
project_domain_id='default', project_domain_name=None,
user_domain_id='default', user_domain_name=None,)
project_domain_id='default', project_domain_name='default',
user_domain_id='default', user_domain_name='default',)
mock_session.Session.assert_called_once_with(
auth=mock_identity.V3Password(), verify=True)
mock_client.Client.assert_called_once_with(