From 2678710c11c998f5b773b5f635ddd91588290001 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Tue, 29 May 2018 08:28:54 +0200 Subject: [PATCH] Make the code run on python3. --- cli.py | 2 +- cve_lookup.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli.py b/cli.py index 26231fc..e68ea49 100755 --- a/cli.py +++ b/cli.py @@ -51,7 +51,7 @@ print('') #print ' '.format(num_cves) print(''.format(num_cves, num_failed_cves)) -for package_name, info in cves.iteritems(): +for package_name, info in cves.items(): for e in info: print(''.format(e['@name'], package_name)) diff --git a/cve_lookup.py b/cve_lookup.py index cbe33e9..773df4b 100644 --- a/cve_lookup.py +++ b/cve_lookup.py @@ -50,11 +50,11 @@ def etree_to_dict(t): if children: dd = defaultdict(list) for dc in map(etree_to_dict, children): - for k, v in dc.iteritems(): + for k, v in dc.items(): dd[k].append(v) - d = {t.tag: {k:v[0] if len(v) == 1 else v for k, v in dd.iteritems()}} + d = {t.tag: {k:v[0] if len(v) == 1 else v for k, v in dd.items()}} if t.attrib: - d[t.tag].update(('@' + k, v) for k, v in t.attrib.iteritems()) + d[t.tag].update(('@' + k, v) for k, v in t.attrib.items()) if t.text: text = t.text.strip() if children or t.attrib: @@ -128,7 +128,7 @@ def get_packages_ls(package_list): name = name[3:] packages[name].add(version) - print name, version + print(name, version) # print "\t".join([path, name, verrel, version, release, platform]) else: errors.append('ERROR: Invalid name: %s\n' % x) @@ -187,10 +187,10 @@ def add_package(name, version): add_package(name, version) except Exception as e: - print e + print(e) errors.append('ERROR: Invalid line: %s\n' % line) - print packages + print(packages) return errors, packages