diff options
author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-08-04 15:03:44 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-08-04 16:19:52 +0200 |
commit | 2ab9822a792e26e9ddb47cbb6bc788a0727c8556 (patch) | |
tree | e33e799a7f8cd9c8672875e84403f005900c5eed /src/config | |
parent | 6fe057efb981ee4b45dcadf131c03f8501fce28d (diff) | |
download | sssd-2ab9822a792e26e9ddb47cbb6bc788a0727c8556.tar.gz sssd-2ab9822a792e26e9ddb47cbb6bc788a0727c8556.tar.xz sssd-2ab9822a792e26e9ddb47cbb6bc788a0727c8556.zip |
SSSDConfig: Return correct types in python3
In Python 3, dict.keys() returns a view rather than a list. Since dict keys
aren't in any particular order, indexing them doesn't make sense.
Resolves:
https://fedorahosted.org/sssd/ticket/2699
Reviewed-by: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'src/config')
-rw-r--r-- | src/config/SSSDConfig/__init__.py.in | 4 | ||||
-rwxr-xr-x | src/config/SSSDConfigTest.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in index 7d361026c..49de53eaa 100644 --- a/src/config/SSSDConfig/__init__.py.in +++ b/src/config/SSSDConfig/__init__.py.in @@ -1498,7 +1498,7 @@ class SSSDConfig(SSSDChangeConf): if srv not in configured_services: del service_dict[srv] - active_services = service_dict.keys() + active_services = list(service_dict) else: active_services = [] @@ -1781,7 +1781,7 @@ class SSSDConfig(SSSDChangeConf): if dom not in configured_domains: del domain_dict[dom] - active_domains = domain_dict.keys() + active_domains = list(domain_dict) else: active_domains = [] diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 1d6107cea..67289e012 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -1299,6 +1299,7 @@ class SSSDConfigTestSSSDConfig(unittest.TestCase): 'nss', 'pam'] active_services = sssdconfig.list_active_services() + self.assertTrue(isinstance(active_services, list)) for service in control_list: self.assertTrue(service in active_services, @@ -1521,6 +1522,7 @@ class SSSDConfigTestSSSDConfig(unittest.TestCase): 'IPA', 'LOCAL'] active_domains = sssdconfig.list_active_domains() + self.assertTrue(isinstance(active_domains, list)) for domain in control_list: self.assertTrue(domain in active_domains, |