diff --git a/origin-manager.py b/origin-manager.py index 7c302f65..c193d5b6 100755 --- a/origin-manager.py +++ b/origin-manager.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 from osclib.core import package_source_hash from osclib.origin import origin_annotation_dump diff --git a/osc-origin.py b/osc-origin.py index ba553c80..fd3e31b3 100644 --- a/osc-origin.py +++ b/osc-origin.py @@ -131,7 +131,7 @@ def osrt_origin_lookup(apiurl, project, force_refresh=False, previous=False, qui with open(lookup_path, 'r') as 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. for package, origin in lookup.items(): lookup[package] = {'origin': origin} diff --git a/osclib/origin.py b/osclib/origin.py index 2266f5a3..c1980f77 100644 --- a/osclib/origin.py +++ b/osclib/origin.py @@ -86,7 +86,7 @@ def config_resolve(apiurl, project, config): origins = config['origins'] i = 0 while i < len(origins): - origin = origins[i].keys()[0] + origin = next(iter(origins[i])) values = origins[i][origin] if origin == '*': @@ -354,9 +354,9 @@ def policy_get(apiurl, project, package, origin): def policy_get_preprocess(apiurl, origin, policy): project = origin.rstrip('~') config_project = Config.get(apiurl, project) - policy['pending_submission_allowed_reviews'] = filter(None, [ + policy['pending_submission_allowed_reviews'] = list(filter(None, [ config_resolve_variable(v, config_project, 'config_source') - for v in policy['pending_submission_allowed_reviews']]) + for v in policy['pending_submission_allowed_reviews']])) return policy diff --git a/osclib/util.py b/osclib/util.py index 50d20a48..c6164da8 100644 --- a/osclib/util.py +++ b/osclib/util.py @@ -159,4 +159,4 @@ def sha1_short(data): if isinstance(data, list): data = '::'.join(data) - return hashlib.sha1(data).hexdigest()[:7] + return hashlib.sha1(data.encode('utf-8')).hexdigest()[:7]