osc-origin, osclib/origin: port first dict key/value access [python3].

This commit is contained in:
Jimmy Berry 2019-05-15 21:01:00 -05:00
parent 7a1ff946cd
commit 743b3a6cd6
2 changed files with 2 additions and 2 deletions

View File

@ -131,7 +131,7 @@ def osrt_origin_lookup(apiurl, project, force_refresh=False, previous=False, qui
with open(lookup_path, 'r') as lookup_stream: with open(lookup_path, 'r') as lookup_stream:
lookup = yaml.safe_load(lookup_stream) lookup = yaml.safe_load(lookup_stream)
if not isinstance(lookup.itervalues().next(), dict): if not isinstance(next(iter(lookup.values())), dict):
# Convert flat format to dictionary. # Convert flat format to dictionary.
for package, origin in lookup.items(): for package, origin in lookup.items():
lookup[package] = {'origin': origin} lookup[package] = {'origin': origin}

View File

@ -86,7 +86,7 @@ def config_resolve(apiurl, project, config):
origins = config['origins'] origins = config['origins']
i = 0 i = 0
while i < len(origins): while i < len(origins):
origin = origins[i].keys()[0] origin = next(iter(origins[i]))
values = origins[i][origin] values = origins[i][origin]
if origin == '*': if origin == '*':