Merge lp:~brian-murray/ubuntu-archive-tools/more-python3 into lp:ubuntu-archive-tools

[Brian Murray]

Move more tools to python3.

[lp:~brian-murray/ubuntu-archive-tools/more-python3]

1420. By Brian Murray on 2020-11-02

move package-subscribers to python3

1421. By Brian Murray on 2020-11-02

move priority-mismatches to python3

1422. By Brian Murray on 2020-11-02

move point-release-snapshot to python3

1423. By Brian Murray on 2020-11-02

switch shebang for priority-mismatches and point-release-snapshot

1424. By Brian Murray on 2020-11-02

move pocket-mismatches to python3

1425. By Brian Murray on 2020-11-02

move kernel_series.py to python3

1426. By Brian Murray on 2020-11-02

move copy-report to python3

1427. By Brian Murray on 2020-11-02

Move architecture-mismatches to python3

=== modified file 'architecture-mismatches'
--- architecture-mismatches	2020-01-25 02:19:13 +0000
+++ architecture-mismatches	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/python3
 
 # Check for override mismatches between architectures
 # Copyright (C) 2005, 2008, 2009, 2010, 2011, 2012  Canonical Ltd.
@@ -18,8 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from __future__ import print_function
-
 import atexit
 from collections import defaultdict
 import csv

=== modified file 'archive-cruft-check'
--- archive-cruft-check	2020-01-25 02:19:13 +0000
+++ archive-cruft-check	2020-11-02 20:20:51 +0000
@@ -1,9 +1,7 @@
-#! /usr/bin/python2.7
+#! /usr/bin/python3
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3.
 
-from __future__ import print_function
-
 from collections import defaultdict
 import logging
 import optparse

=== modified file 'bootstrap-package'
--- bootstrap-package	2020-01-25 02:19:13 +0000
+++ bootstrap-package	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.7
+#! /usr/bin/python3
 
 # Copyright (C) 2016  Canonical Ltd.
 # Author: Colin Watson <[e-mail]>
@@ -17,7 +17,6 @@
 
 """Bootstrap a package build using injected build-dependencies."""
 
-from __future__ import print_function
 import sys
 
 from optparse import (

=== modified file 'copy-report'
--- copy-report	2020-01-25 02:19:13 +0000
+++ copy-report	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.7
+#! /usr/bin/python3
 
 from __future__ import print_function
 
@@ -11,10 +11,8 @@
 import shutil
 import subprocess
 import tempfile
-try:
-    from urllib.parse import unquote
-except ImportError:
-    from urllib import unquote
+
+from urllib.parse import unquote
 
 import apt_pkg
 from launchpadlib.launchpad import Launchpad

=== modified file 'derive-distribution'
--- derive-distribution	2020-01-25 02:19:13 +0000
+++ derive-distribution	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.7
+#! /usr/bin/python3
 
 # Copyright (C) 2014 Canonical Ltd.
 # Author: Colin Watson <[e-mail]>
@@ -19,8 +19,6 @@
 
 """Copy a subset of one distribution into a derived distribution."""
 
-from __future__ import print_function
-
 import atexit
 from collections import OrderedDict
 from contextlib import closing, contextmanager
@@ -33,10 +31,8 @@
 import sys
 import tempfile
 import time
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+
+from urllib.request import urlopen
 
 import apt_pkg
 from dateutil import parser as dateutil_parser
@@ -217,7 +213,7 @@
             for inner_seed in germinator._inner_seeds(seed):
                 if inner_seed.name not in all_seeds:
                     all_seeds[inner_seed.name] = inner_seed
-        for seed in all_seeds.values():
+        for seed in list(all_seeds.values()):
             sources = seed._sourcepkgs | seed._build_sourcepkgs
             for source in sources:
                 version = germinator._sources[source]["Version"]
@@ -275,7 +271,7 @@
             for source in germinator._sources:
                 self._versions[source] = germinator._sources[source]["Version"]
         else:
-            for flavour, seed_names in flavours.items():
+            for flavour, seed_names in list(flavours.items()):
                 logging.info("Germinating for %s/%s/%s", flavour, suite, arch)
                 self.germinateArchFlavour(
                     germinator, suite, arch, flavour, structures[flavour],

=== modified file 'get-distro-update-metrics'
--- get-distro-update-metrics	2020-01-25 02:19:13 +0000
+++ get-distro-update-metrics	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.7
+#! /usr/bin/python3
 # Copyright 2012 Canonical Ltd.
 #
 # This script will write update metrics for a given Ubuntu release in CSV
@@ -25,7 +25,7 @@
         [key, {'Updates': X, 'Security': X, 'Total': X}] record.
     """
     logging.info('Writing metrics by %s to %s', key_name.lower(), filename)
-    writer = csv.writer(open(filename, 'wb'))
+    writer = csv.writer(open(filename, 'w'))
     writer.writerow([key_name, 'Updates', 'Security', 'Total'])
     for key, metrics in metrics:
         writer.writerow(
@@ -105,7 +105,7 @@
         options.distribution, args[0])
     write_metrics_csv(
         by_package_filename, 'Package', sorted(
-            updates_by_package.items(),
+            list(updates_by_package.items()),
             key=lambda m: m[1]['Total'], reverse=True))
 
 

=== modified file 'import-blacklist'
--- import-blacklist	2020-01-25 02:19:13 +0000
+++ import-blacklist	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 
 # Copyright (C) 2011  Iain Lane
 # Copyright (C) 2011  Stefano Rivera
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function, unicode_literals
-
 from optparse import OptionParser
 import re
 

=== modified file 'iso-deb-size-compare'
--- iso-deb-size-compare	2020-01-25 02:19:13 +0000
+++ iso-deb-size-compare	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010, 2012  Canonical Ltd.
@@ -21,8 +21,6 @@
 # two releases or daily builds. Note that this only really works for
 # alternates, since desktop CDs by and large just have one big squashfs image.
 
-from __future__ import print_function
-
 import subprocess
 import sys
 
@@ -62,7 +60,7 @@
 
 print('== Removed packages ==')
 sum = 0
-for p, (v, s) in old_map.iteritems():
+for p, (v, s) in old_map.items():
     if p not in new_map:
         print('%s (%.1f MB)' % (p, s / 1000000.))
         sum += s
@@ -70,7 +68,7 @@
 
 sum = 0
 print('\n== Added packages ==')
-for p, (v, s) in new_map.iteritems():
+for p, (v, s) in new_map.items():
     if p not in old_map:
         print('%s (%.1f MB)' % (p, s / 1000000.))
         sum += s
@@ -78,7 +76,7 @@
 
 print('\n== Changed packages ==')
 sum = 0
-for p, (v, s) in old_map.iteritems():
+for p, (v, s) in old_map.items():
     if p not in new_map:
         continue
 

=== modified file 'kernel-overrides'
--- kernel-overrides	2020-01-25 02:19:13 +0000
+++ kernel-overrides	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.7
+#! /usr/bin/python3
 
 # Copyright (C) 2009, 2010, 2011, 2012 Canonical Ltd.
 
@@ -16,8 +16,6 @@
 
 """Apply suitable overrides to new kernel binaries, matching previous ones."""
 
-from __future__ import print_function
-
 import atexit
 from collections import defaultdict
 from contextlib import closing
@@ -27,10 +25,8 @@
 import shutil
 import sys
 import tempfile
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+
+from urllib.request import urlopen
 
 import apt_pkg
 from launchpadlib.launchpad import Launchpad
@@ -175,7 +171,7 @@
             if binary["architecture"] not in current_binaries:
                 continue
             current_binaries_arch = current_binaries[binary["architecture"]]
-            for name, component in current_binaries_arch.items():
+            for name, component in list(current_binaries_arch.items()):
                 if (binary["component"] != component and
                         equal_except_abi(name, binary["name"], newabi)):
                     print("\t%s: %s -> %s" %

=== modified file 'kernel_series.py'
--- kernel_series.py	2020-01-25 02:19:13 +0000
+++ kernel_series.py	2020-11-02 20:20:51 +0000
@@ -1,10 +1,7 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/python3
 #
 
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 
 import os
 import yaml
@@ -50,7 +47,7 @@
         return not self.__eq__(other)
 
     def __iter__(self):
-        return iter(self._data.items())
+        return iter(list(self._data.items()))
 
     def __getitem__(self, which):
         return self._data[which]
@@ -323,7 +320,7 @@
         result = []
         packages = self._data.get('packages')
         if packages:
-            for package_key, package in packages.items():
+            for package_key, package in list(packages.items()):
                 result.append(KernelPackageEntry(self._ks, self, package_key, package))
         return result
 
@@ -339,7 +336,7 @@
         result = []
         snaps = self._data.get('snaps')
         if snaps:
-            for snap_key, snap in snaps.items():
+            for snap_key, snap in list(snaps.items()):
                 result.append(KernelSnapEntry(self._ks, self, snap_key, snap))
         return result
 
@@ -524,7 +521,7 @@
         result = []
         sources = self._data.get('sources')
         if sources:
-            for source_key, source in sources.items():
+            for source_key, source in list(sources.items()):
                 result.append(KernelSourceEntry(
                     self._ks, self, source_key, source))
         return result
@@ -574,7 +571,7 @@
 
         self._development_series = None
         self._codename_to_series = {}
-        for series_key, series in self._data.items():
+        for series_key, series in list(self._data.items()):
             if not series:
                 continue
             if series.get('development', False):
@@ -596,7 +593,7 @@
     def series(self):
         return [KernelSeriesEntry(self, series_key, series,
                 defaults=self._defaults_series)
-                for series_key, series in self._data.items()]
+                for series_key, series in list(self._data.items())]
 
     def lookup_series(self, series=None, codename=None, development=False):
         if not series and not codename and not development:

=== modified file 'list-builds-on-tracker'
--- list-builds-on-tracker	2020-01-25 02:19:13 +0000
+++ list-builds-on-tracker	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 # Copyright (C) 2012  Canonical Ltd.
 
 # This program is free software: you can redistribute it and/or modify

=== modified file 'nbs-report'
--- nbs-report	2020-10-23 15:03:51 +0000
+++ nbs-report	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 
 # Copyright (C) 2011, 2012  Canonical Ltd.
 # Author: Martin Pitt <[e-mail]>
@@ -19,8 +19,6 @@
 # Generate a HTML report of current NBS binary packages from a checkrdepends
 # output directory
 
-from __future__ import print_function
-
 from collections import defaultdict
 import csv
 from optparse import OptionParser

=== modified file 'orphaned-sources'
--- orphaned-sources	2020-01-25 02:19:13 +0000
+++ orphaned-sources	2020-11-02 20:20:51 +0000
@@ -1,6 +1,4 @@
-#! /usr/bin/python2.7
-
-from __future__ import print_function
+#! /usr/bin/python3
 
 import atexit
 from contextlib import closing
@@ -9,10 +7,8 @@
 import shutil
 import sys
 import tempfile
-try:
-    from urllib.request import urlretrieve
-except ImportError:
-    from urllib import urlretrieve
+
+from urllib.request import urlretrieve
 
 import apt_pkg
 from launchpadlib.launchpad import Launchpad

=== modified file 'package-subscribers'
--- package-subscribers	2020-07-23 08:22:44 +0000
+++ package-subscribers	2020-11-02 20:20:51 +0000
@@ -1,6 +1,4 @@
-#! /usr/bin/python2.7
-
-from __future__ import print_function
+#! /usr/bin/python3
 
 import atexit
 import bz2

=== modified file 'packageset-report'
--- packageset-report	2020-01-25 02:19:13 +0000
+++ packageset-report	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2013 Canonical Ltd.

=== modified file 'pocket-mismatches'
--- pocket-mismatches	2020-01-25 02:19:13 +0000
+++ pocket-mismatches	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/python3
 
 # Check for override mismatches between pockets
 # Copyright (C) 2005, 2008, 2011, 2012  Canonical Ltd.
@@ -18,8 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from __future__ import print_function
-
 import atexit
 from collections import defaultdict
 import gzip

=== modified file 'point-release-snapshot'
--- point-release-snapshot	2020-01-25 02:19:13 +0000
+++ point-release-snapshot	2020-11-02 20:20:51 +0000
@@ -1,6 +1,4 @@
-#! /usr/bin/env python2.7
-
-from __future__ import print_function
+#! /usr/bin/python3
 
 from optparse import OptionParser
 import os

=== modified file 'post-amis-to-iso-tracker'
--- post-amis-to-iso-tracker	2020-01-25 02:19:13 +0000
+++ post-amis-to-iso-tracker	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.7
+#! /usr/bin/python3
 
 # Copyright (C) 2010, 2011, 2012  Canonical Ltd.
 
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 import argparse
 import os
 import sys

=== modified file 'post-image-to-iso-tracker'
--- post-image-to-iso-tracker	2020-01-25 02:19:13 +0000
+++ post-image-to-iso-tracker	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 
 # Copyright (C) 2011  Canonical Ltd.
 # Author: Colin Watson <[e-mail]>

=== modified file 'priority-mismatches'
--- priority-mismatches	2020-01-25 02:19:13 +0000
+++ priority-mismatches	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/python3
 
 # Synchronise package priorities with germinate output
 # Copyright (C) 2005, 2009, 2010, 2011, 2012  Canonical Ltd.
@@ -25,8 +25,6 @@
 #        i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc
 # <elmo> I hid it in the pool, being the cunning cabalist that I am
 
-from __future__ import print_function
-
 import atexit
 from collections import defaultdict
 import csv
@@ -144,7 +142,7 @@
     important_pkgs = [
         pkg for pkg in important_pkgs if not re_not_base.match(pkg)]
     if standard_seed is not None:
-        standard_pkgs = read_germinate(suite, arch, standard_seed).keys()
+        standard_pkgs = list(read_germinate(suite, arch, standard_seed).keys())
     required_pkgs.sort()
     important_pkgs.sort()
     standard_pkgs.sort()

=== modified file 'promote-to-release'
--- promote-to-release	2020-01-25 02:19:13 +0000
+++ promote-to-release	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.7
+#! /usr/bin/python3
 
 # Copyright (C) 2012  Canonical Ltd.
 # Author: Colin Watson <[e-mail]>
@@ -17,8 +17,6 @@
 
 """Promote packages to release pocket based on britney output."""
 
-from __future__ import print_function
-
 from optparse import OptionParser
 import sys
 

=== modified file 'publish-image-set'
--- publish-image-set	2020-10-21 12:47:17 +0000
+++ publish-image-set	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010, 2011, 2012  Canonical Ltd.
@@ -32,8 +32,6 @@
 #  <releaseflag>: yes/no/poolonly/named (should appear on releases.u.c.?)
 #  <name>: name of the release (alpha-2, beta, etc.)
 
-from __future__ import print_function
-
 from collections import defaultdict
 import optparse
 import re
@@ -183,7 +181,7 @@
             project = 'ubuntu'
         if 'Preinstalled' in product:
             type = 'preinstalled-%s' % type
-        if (ms.series_string == u'Focal' and
+        if (ms.series_string == 'Focal' and
             project == 'ubuntu' and type == 'server'):
             project = 'ubuntu-server'
             type = 'legacy-server'
@@ -306,9 +304,9 @@
 
     print('\n## publish images:')
     source_milestone = None
-    for project, builds in info['build_map'].items():
-        for type, buildstamps in builds.items():
-            for buildstamp, arches in buildstamps.items():
+    for project, builds in list(info['build_map'].items()):
+        for type, buildstamps in list(builds.items()):
+            for buildstamp, arches in list(buildstamps.items()):
                 do_publish_release(opts, project, type, buildstamp, arches,
                                    info['milestone_code'], info['stable'])
                 source_milestone = info['milestone_code']

=== modified file 'queuediff'
--- queuediff	2020-10-23 19:29:46 +0000
+++ queuediff	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 
 # Copyright (C) 2009, 2010, 2011, 2012  Canonical Ltd.
 # Copyright (C) 2010  Scott Kitterman <[e-mail]>
@@ -25,17 +25,14 @@
     queuediff -s hardy -b hal | view -
 '''
 
-from __future__ import print_function
-
 import gzip
 import optparse
 import re
 import sys
-try:
-    from urllib.parse import quote
-    from urllib.request import urlopen, urlretrieve
-except ImportError:
-    from urllib import quote, urlopen, urlretrieve
+
+from urllib.parse import quote
+from urllib.request import urlopen, urlretrieve
+
 import webbrowser
 
 from launchpadlib.launchpad import Launchpad

=== modified file 'regression-proposed-bug-search'
--- regression-proposed-bug-search	2020-01-25 02:19:13 +0000
+++ regression-proposed-bug-search	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 
 # Copyright (C) 2012 Canonical, Ltd.
 # Author: Brian Murray <[e-mail]>
@@ -20,16 +20,11 @@
 # since the date the package was uploaded to proposed for apport and release
 # tagged bugs that contain the version of the package from -proposed
 
-from __future__ import print_function
-
 import optparse
 
 from launchpadlib.launchpad import Launchpad
 
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib import urlopen
+from urllib.request import urlopen
 
 
 def bugs_from_changes(change_url):

=== modified file 'rescore-ppa-builds'
--- rescore-ppa-builds	2020-01-25 02:19:13 +0000
+++ rescore-ppa-builds	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 # Rescore all builds in a PPA.
 #
 # Copyright (C) 2012  Canonical Ltd.
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 from optparse import OptionParser
 
 from launchpadlib.launchpad import Launchpad

=== modified file 'sync-blacklist'
--- sync-blacklist	2020-01-25 02:19:13 +0000
+++ sync-blacklist	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 
 # Copyright (C) 2011  Iain Lane
 # Copyright (C) 2011  Stefano Rivera
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function, unicode_literals
-
 from optparse import OptionParser
 
 from launchpadlib.launchpad import Launchpad

=== modified file 'utils.py'
--- utils.py	2020-01-25 02:19:13 +0000
+++ utils.py	2020-11-02 20:20:51 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
 
 # Copyright (C) 2019 Canonical Ltd.
 # Author: Brian Murray <[e-mail]>