diff options
| author | Cyril Roelandt <cyril@redhat.com> | 2018-09-04 18:47:31 +0200 |
|---|---|---|
| committer | Cyril Roelandt <cyril@redhat.com> | 2018-09-04 18:47:31 +0200 |
| commit | 6ce857397d74f792eaa25eed5326c00565aec850 (patch) | |
| tree | 54dc1f7e5844d77b7d0541856a961db52f1d2b89 /glance_store | |
| parent | 11db636c346c2a5ffcdc9a33633844939d116352 (diff) | |
| download | glance_store-6ce857397d74f792eaa25eed5326c00565aec850.tar.gz | |
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
Diffstat (limited to 'glance_store')
| -rw-r--r-- | glance_store/_drivers/swift/utils.py | 4 | ||||
| -rw-r--r-- | glance_store/tests/unit/test_swift_store.py | 4 | ||||
| -rw-r--r-- | glance_store/tests/unit/test_swift_store_multibackend.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/glance_store/_drivers/swift/utils.py b/glance_store/_drivers/swift/utils.py index 7ddbfb5..bbd8a4c 100644 --- a/glance_store/_drivers/swift/utils.py +++ b/glance_store/_drivers/swift/utils.py @@ -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) diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py index 4355b38..0081e2d 100644 --- a/glance_store/tests/unit/test_swift_store.py +++ b/glance_store/tests/unit/test_swift_store.py @@ -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( diff --git a/glance_store/tests/unit/test_swift_store_multibackend.py b/glance_store/tests/unit/test_swift_store_multibackend.py index 493cdd2..1d70beb 100644 --- a/glance_store/tests/unit/test_swift_store_multibackend.py +++ b/glance_store/tests/unit/test_swift_store_multibackend.py @@ -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( |