diff --git a/scripts/compare_packages.py b/scripts/compare_packages.py index 4df56b8..805346b 100755 --- a/scripts/compare_packages.py +++ b/scripts/compare_packages.py @@ -1,5 +1,4 @@ -#!/bin/env python -from __future__ import print_function +#!/usr/bin/env python3 from collections import OrderedDict import argparse import os @@ -42,19 +41,19 @@ def main(): rpms1 = list_rpms(dir1) rpms2 = list_rpms(dir2) - for name, info in rpms1.iteritems(): + for name, info in rpms1.items(): if name not in rpms2: info['removed'] = True rpms2[name] = info - rpms2 = OrderedDict(sorted(rpms2.iteritems(), key=lambda t: t[0])) + rpms2 = OrderedDict(sorted(rpms2.items(), key=lambda t: t[0])) - vendors = set([info['vendor'] for info in rpms1.itervalues()]) - vendors |= set([info['vendor'] for info in rpms2.itervalues()]) + vendors = set([info['vendor'] for info in rpms1.values()]) + vendors |= set([info['vendor'] for info in rpms2.values()]) for vendor in sorted(list(vendors)): print("\n\n-------------------- Vendor: %s ------------------------\n" % vendor) - for name, info in rpms2.iteritems(): + for name, info in rpms2.items(): if info['vendor'] != vendor: continue if name not in rpms1: diff --git a/scripts/create_rpm_git_repo.py b/scripts/create_rpm_git_repo.py index 80ba62c..428f1cb 100755 --- a/scripts/create_rpm_git_repo.py +++ b/scripts/create_rpm_git_repo.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse import os diff --git a/scripts/download_centos.py b/scripts/download_centos.py index a9e103f..a42d371 100755 --- a/scripts/download_centos.py +++ b/scripts/download_centos.py @@ -1,5 +1,4 @@ -#!/bin/env python2 -from __future__ import print_function +#!/usr/bin/env python3 import argparse import os import sys diff --git a/scripts/get_newer_rpm_if_exists.py b/scripts/get_newer_rpm_if_exists.py index e37b779..d304fd4 100755 --- a/scripts/get_newer_rpm_if_exists.py +++ b/scripts/get_newer_rpm_if_exists.py @@ -1,5 +1,4 @@ -#!/bin/env python -from __future__ import print_function +#!/usr/bin/env python3 import argparse import csv import rpm @@ -76,7 +75,7 @@ def main(): srpm_evrs.append(filename, evr) latest_srpm = filename - for srpm_filename, srpm_evr in srpm_evrs.iteritems(): + for srpm_filename, srpm_evr in srpm_evrs.items(): if compare_evrs(srpm_evr, srpm_evrs[latest_srpm]) > 0: latest_srpm = srpm_filename diff --git a/scripts/import_srpm.py b/scripts/import_srpm.py index 826ba28..05fdbdb 100755 --- a/scripts/import_srpm.py +++ b/scripts/import_srpm.py @@ -1,5 +1,4 @@ -#!/bin/env python -from __future__ import print_function +#!/usr/bin/env python3 import argparse import os import subprocess diff --git a/scripts/retire_rpm_git_repo.py b/scripts/retire_rpm_git_repo.py index 8529c70..8eb4723 100755 --- a/scripts/retire_rpm_git_repo.py +++ b/scripts/retire_rpm_git_repo.py @@ -1,5 +1,4 @@ -#!/bin/env python -from __future__ import print_function +#!/usr/bin/env python3 import argparse import os import subprocess