X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fserver%2Fsfa-start.py;h=5c3a2e4021cfa6219b1df413710f021f4052fd8c;hp=cb14adb3335e6626a7a61ccf44f82b1060df592a;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hpb=648ac3fd865ea29425485f26eb0a7bf1a62281e0 diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py index cb14adb3..5c3a2e40 100755 --- a/sfa/server/sfa-start.py +++ b/sfa/server/sfa-start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # # PlanetLab SFA implementation # @@ -60,7 +60,7 @@ def install_peer_certs(server_key_file, server_cert_file): api = SfaApi(key_file=server_key_file, cert_file=server_cert_file) registries = Registries() aggregates = Aggregates() - interfaces = dict(registries.items() + aggregates.items()) + interfaces = dict(list(registries.items()) + list(aggregates.items())) gids_current = api.auth.trusted_cert_list hrns_current = [gid.get_hrn() for gid in gids_current] hrns_expected = set([hrn for hrn in interfaces])