Merge ~cjwatson/launchpadlib:remove-py2 into launchpadlib:main

[Colin Watson]

Remove support for Python 2

I noticed that a number of the scripts in `contrib/` were Python-2-only, so I did a basic untested port of those while I was here.

I also took advantage of the opportunity to simplify coverage testing.

[Guruprasad (lgp171188)]

Hi Colin, thank you for your contribution!

The changes look good to me with a couple of comments. 👍

review: Approve

Unmerged commits

bcd20d9... by Colin Watson on 2024-03-03

Simplify coverage testing

We no longer need the more complex arrangements after dropping Python 2
support.

	lint:0 (build)
	tests:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

0b5b426... by Colin Watson on 2024-03-03

Apply pyupgrade --py3-plus

f22d37e... by Colin Watson on 2024-03-03

Remove support for Python 2

I noticed that a number of the scripts in `contrib/` were Python-2-only,
so I did a basic untested port of those while I was here.

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ec0cbbd..e9cff43 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,19 +12,18 @@ repos:
     -   id: check-yaml
     -   id: debug-statements
 -   repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 7.0.0
     hooks:
     -   id: flake8
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.4 # v3 drops Python 2 support
+    rev: v3.15.1
     hooks:
     -   id: pyupgrade
-        args: [--keep-percent-format]
+        args: [--keep-percent-format, --py3-plus]
 -   repo: https://github.com/psf/black
-    rev: 21.12b0 # v22 drops Python 2 support
+    rev: 24.2.0
     hooks:
     -   id: black
-        additional_dependencies: ['click<8.1']
 -   repo: https://github.com/get-woke/woke
     rev: v0.19.0
     hooks:
diff --git a/NEWS.rst b/NEWS.rst
index 46c712a..aec5c42 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -2,6 +2,10 @@
 NEWS for launchpadlib
 =====================
 
+2.0.0
+=====
+- Remove support for Python 2.
+
 1.11.0 (2023-01-09)
 ===================
 - Move the ``keyring`` dependency to a new ``keyring`` extra.
diff --git a/contrib/_pythonpath.py b/contrib/_pythonpath.py
index 6bf7934..04b8147 100644
--- a/contrib/_pythonpath.py
+++ b/contrib/_pythonpath.py
@@ -1,5 +1,3 @@
-__metaclass__ = type
-
 import sys
 import os
 
diff --git a/contrib/close-my-bugs.py b/contrib/close-my-bugs.py
index ca925a2..bdf16c7 100755
--- a/contrib/close-my-bugs.py
+++ b/contrib/close-my-bugs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (C) 2009-2013 Canonical Ltd.
 #
@@ -92,22 +92,22 @@ def main(args):
             **extra_kwargs)]
 
     for task in committed_tasks:
-        print "Bug #%s: %s" % (task.bug.id, task.bug.title)
+        print("Bug #%s: %s" % (task.bug.id, task.bug.title))
 
     if options.dry_run:
-        print '\n*** Nothing changed.  Re-run without --dry-run/-n to commit.'
+        print('\n*** Nothing changed.  Re-run without --dry-run/-n to commit.')
     else:
         if not options.force:
-            answer = raw_input("Mark these bugs as Fix Released?  [y/N]")
+            answer = input("Mark these bugs as Fix Released?  [y/N]")
             if answer in ("n", "N") or not answer:
-                print "Ok, leaving them alone."
+                print("Ok, leaving them alone.")
                 return
 
         for task in committed_tasks:
-            print "Releasing %s" % task.bug.id
+            print("Releasing %s" % task.bug.id)
             task.status = FIX_RELEASED
             task.lp_save()
-        print "Done."
+        print("Done.")
 
     return 0
 
diff --git a/contrib/commercial-member-api.py b/contrib/commercial-member-api.py
index 1e84b25..f5c0031 100755
--- a/contrib/commercial-member-api.py
+++ b/contrib/commercial-member-api.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*-doctest-*-
 
 """
@@ -6,16 +6,16 @@
     >>> lp = lpapi.lp_factory('dev')
     >>> bzr = lp.projects['bzr']
     >>> bzr.reviewer_whiteboard = "Check on licensing"
-    >>> print bzr.reviewer_whiteboard
+    >>> print(bzr.reviewer_whiteboard)
     Check on licensing
     >>> bzr.lp_save()
-    >>> print bzr.reviewer_whiteboard
+    >>> print(bzr.reviewer_whiteboard)
     Check on licensing
 
     >>> from operator import attrgetter
     >>> def print_projs(projs):
     ...     for p in sorted(projs, key=attrgetter('name')):
-    ...         print p.name
+    ...         print(p.name)
 
     >>> inactive = lp.projects.licensing_search(active=False)
     >>> print_projs(inactive)
@@ -133,11 +133,11 @@
     launchpad
 
     >>> l = projs[2]
-    >>> print l.name
+    >>> print(l.name)
     launchpad
-    >>> print l.description
+    >>> print(l.description)
     Launchpad's design is inspired by the Description of a Project (DOAP) framework by Edd Dumbill, with extensions for actual releases of products.
-    >>> print l.summary
+    >>> print(l.summary)
     Launchpad is a catalogue of libre software projects and products. Projects registered in the Launchpad are linked to their translations in Rosetta, their bugs in Malone, their RCS imports in Bazaar, and their packages in Soyuz.
 
 """
@@ -151,9 +151,9 @@ if __name__ == '__main__':
         pass
 
     # Create correct credentials.
-    print "Login as '[e-mail]' in your browser."
-    print "Press <Enter> when done."
-    raw_input()
+    print("Login as '[e-mail]' in your browser.")
+    print("Press <Enter> when done.")
+    input()
 
     # Import _pythonpath and the lpapi module.  _pythonpath must
     # precede the import of lpapi as it redefines sys.path.
diff --git a/contrib/delete_bugtasks.py b/contrib/delete_bugtasks.py
index a9eefe5..490d392 100755
--- a/contrib/delete_bugtasks.py
+++ b/contrib/delete_bugtasks.py
@@ -1,6 +1,4 @@
-#!/usr/bin/python
-
-__metaclass__ = type
+#!/usr/bin/python3
 
 from collections import defaultdict
 from optparse import OptionParser
@@ -44,7 +42,7 @@ class SharedBugsFixer:
     def log(self, message, leader='    ', error=False):
         """Report to STDOUT."""
         if error or self.verbose:
-            print '%s%s' % (leader, message)
+            print('%s%s' % (leader, message))
 
     def _get_target_type(self, bug_target):
         """Return the bug target entity type."""
@@ -105,9 +103,9 @@ class SharedBugsFixer:
             self.log("! bug affects 1 pillar now.")
         except UnsupportedSeriesSplit:
             self.log("! This script cannot split bugs that affect series.")
-        except (KeyError, Unauthorized), e:
+        except (KeyError, Unauthorized):
             self.log("! bug %s is owned by someone else" % pillar_name)
-        except Exception, e:
+        except Exception as e:
             # Something went very wrong.
             self.log("!! %s" % str(e), error=True)
 
diff --git a/contrib/lp-bug-ifier.py b/contrib/lp-bug-ifier.py
index d911c5c..5197a70 100755
--- a/contrib/lp-bug-ifier.py
+++ b/contrib/lp-bug-ifier.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Scan stdin for text matching bug references and insert the bug title into the
@@ -25,7 +25,7 @@ from launchpadlib.launchpad import Launchpad
 
 
 bug_re = re.compile(r"[Bb]ug(?:\s|<br\s*/>)*(?:\#|report|number\.?|num\.?|no\.?)?"
-                     "(?:\s|<br\s*/>)*(?P<bugnum>\d+)")
+                    r"(?:\s|<br\s*/>)*(?P<bugnum>\d+)")
 
 launchpad = Launchpad.login_with(os.path.basename(sys.argv[0]), 'production')
 bugs = launchpad.bugs
@@ -44,7 +44,7 @@ def add_summary_to_bug(match):
 
 def main():
     text = sys.stdin.read()
-    print bug_re.sub(add_summary_to_bug, text)
+    print(bug_re.sub(add_summary_to_bug, text))
 
 if __name__ == '__main__':
     main()
diff --git a/contrib/lpapi.py b/contrib/lpapi.py
index dfd1633..2c8730f 100644
--- a/contrib/lpapi.py
+++ b/contrib/lpapi.py
@@ -1,8 +1,7 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python3
 import os
 import sys
-from urlparse import urljoin
-import commands
+from urllib.parse import urljoin
 
 try:
     from launchpadlib.launchpad import (
@@ -11,8 +10,8 @@ try:
     from launchpadlib.errors import *
     import launchpadlib
 except ImportError:
-    print >> sys.stderr, "Usage:"
-    print >> sys.stderr, "   PYTHONPATH=somebranch/lib %s" % sys.argv[0]
+    print("Usage:", file=sys.stderr)
+    print("   PYTHONPATH=somebranch/lib %s" % sys.argv[0], file=sys.stderr)
     raise
 
 
@@ -42,12 +41,12 @@ class LPSystem:
             self.auth_file = os.path.join(home, self.auth_file_name)
             self.credentials = Credentials()
             self.credentials.load(open(self.auth_file))
-            print >> sys.stderr, "Loading credentials..."
+            print("Loading credentials...", file=sys.stderr)
             try:
                 self.launchpad = Launchpad(self.credentials, self.endpoint,
                                            cache=cache_dir)
             except launchpadlib.errors.HTTPError:
-                raise InvalidCredentials, (
+                raise InvalidCredentials(
                     "Please remove %s and rerun %s to authenticate." % (
                     self.auth_file, sys.argv[0]))
         except IOError:
@@ -58,9 +57,9 @@ class LPSystem:
                                                                self.endpoint,
                                                                cache=cache_dir)
                 self.launchpad.credentials.save(open(self.auth_file, "w"))
-                print >> sys.stderr, "Credentials saved"
-            except launchpadlib.errors.HTTPError, err:
-                print >> sys.stderr, err.content
+                print("Credentials saved", file=sys.stderr)
+            except launchpadlib.errors.HTTPError as err:
+                print(err.content, file=sys.stderr)
                 raise
 
     @property
@@ -102,6 +101,6 @@ def lp_factory(system_name, app_name='just_testing'):
         lpinstance = systems[system_name]
         return lpinstance(app_name).launchpad
     except KeyError:
-        print >> sys.stderr, "System '%s' not supported." % system_name
-        print >> sys.stderr, "Use one of: ", systems.keys()
+        print("System '%s' not supported." % system_name, file=sys.stderr)
+        print("Use one of: ", systems.keys(), file=sys.stderr)
         return None
diff --git a/contrib/nopriv-api.py b/contrib/nopriv-api.py
index abe2b28..66cadc6 100755
--- a/contrib/nopriv-api.py
+++ b/contrib/nopriv-api.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*-doctest-*-
 
 """
@@ -6,10 +6,10 @@
     >>> lp = lpapi.lp_factory('dev')
 
     >>> bzr = lp.projects['bzr']
-    >>> print bzr.reviewer_whiteboard
+    >>> print(bzr.reviewer_whiteboard)
     tag:launchpad.net:2008:redacted
     >>> bzr.reviewer_whiteboard = "Check on licensing"
-    >>> print bzr.reviewer_whiteboard
+    >>> print(bzr.reviewer_whiteboard)
     Check on licensing
     >>> bzr.lp_save()
     ...
@@ -78,9 +78,9 @@ if __name__ == '__main__':
         pass
 
     # Create correct credentials.
-    print "Login as '[e-mail]' in your browser."
-    print "Press <Enter> when done."
-    raw_input()
+    print("Login as '[e-mail]' in your browser.")
+    print("Press <Enter> when done.")
+    input()
 
     # Import _pythonpath and the lpapi module.  _pythonpath must
     # precede the import of lpapi as it redefines sys.path.
diff --git a/contrib/sample-person-api.py b/contrib/sample-person-api.py
index a7b3488..51118b4 100755
--- a/contrib/sample-person-api.py
+++ b/contrib/sample-person-api.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*-doctest-*-
 
 """
@@ -6,10 +6,10 @@
     >>> lp = lpapi.lp_factory('dev')
 
     >>> bzr = lp.projects['bzr']
-    >>> print bzr.reviewer_whiteboard
+    >>> print(bzr.reviewer_whiteboard)
     tag:launchpad.net:2008:redacted
     >>> bzr.reviewer_whiteboard = "Check on licensing"
-    >>> print bzr.reviewer_whiteboard
+    >>> print(bzr.reviewer_whiteboard)
     Check on licensing
     >>> bzr.lp_save()
     ...
@@ -78,9 +78,9 @@ if __name__ == '__main__':
         pass
 
     # Create correct credentials.
-    print "Login as '[e-mail]' in your browser."
-    print "Press <Enter> when done."
-    raw_input()
+    print("Login as '[e-mail]' in your browser.")
+    print("Press <Enter> when done.")
+    input()
 
     # Import _pythonpath and the lpapi module.  _pythonpath must
     # precede the import of lpapi as it redefines sys.path.
diff --git a/contrib/upload_release_tarball.py b/contrib/upload_release_tarball.py
index 335987a..7a51370 100755
--- a/contrib/upload_release_tarball.py
+++ b/contrib/upload_release_tarball.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # This script uploads a tarball as a file for a (possibly new)
 # release. It takes these command-line arguments:
@@ -61,14 +61,14 @@ if os.path.exists(signature_path):
 else:
     # There is no signature.
     if options.force:
-        print ('WARNING: Signature file "%s" is not present. Continuing '
-               'without it.' % signature_path)
+        print('WARNING: Signature file "%s" is not present. Continuing '
+              'without it.' % signature_path)
         signature_name = None
         signature = None
     else:
-        print 'ERROR: Signature file "%s" is not present.' % signature_path
-        print 'Run "gpg --armor --sign --detach-sig" on the tarball.'
-        print 'Or re-run this script with the --force option.'
+        print('ERROR: Signature file "%s" is not present.' % signature_path)
+        print('Run "gpg --armor --sign --detach-sig" on the tarball.')
+        print('Or re-run this script with the --force option.')
         sys.exit(-1)
 
 # Now we interact with Launchpad.
@@ -92,8 +92,8 @@ series = matching_series[0]
 matching_milestones = [milestone for milestone in series.active_milestones
                        if milestone.name == version_name]
 if len(matching_milestones) == 0:
-    print 'No milestone "%s" for %s/%s. Creating it.' % (
-        version_name, project.name, series.name)
+    print('No milestone "%s" for %s/%s. Creating it.' % (
+        version_name, project.name, series.name))
     milestone = series.newMilestone(name=version_name)
 else:
     milestone = matching_milestones[0]
@@ -106,8 +106,8 @@ if len(matching_releases) == 0:
     #
     # The changelog and release notes could go into this operation
     # invocation.
-    print "No release for %s/%s/%s. Creating it." % (
-        project.name, series.name, version_name)
+    print("No release for %s/%s/%s. Creating it." % (
+        project.name, series.name, version_name))
     release = milestone.createProductRelease(
         date_released=datetime.now(pytz.UTC))
 else:
@@ -124,5 +124,5 @@ if signature is not None:
 result = release.add_file(**kwargs)
 
 # We know this succeeded because add_file didn't raise an exception.
-print "Success!"
-print result.self_link
+print("Success!")
+print(result.self_link)
diff --git a/pyproject.toml b/pyproject.toml
index 486bbe6..1f331da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 79
-target-version = ['py27']
+target-version = ['py35']
diff --git a/setup.py b/setup.py
index 0f4d391..7bbf7ce 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2008-2022 Canonical Ltd.
 #
@@ -46,7 +46,6 @@ install_requires = [
     'importlib-metadata; python_version < "3.8"',
     "lazr.restfulclient>=0.14.2",
     "lazr.uri",
-    "six",
 ]
 
 setup(
@@ -64,6 +63,7 @@ setup(
     description=open("README.rst").readline().strip(),
     long_description=generate("src/launchpadlib/docs/index.rst", "NEWS.rst"),
     license="LGPL v3",
+    python_requires=">=3.5",
     install_requires=install_requires,
     url="https://help.launchpad.net/API/launchpadlib",
     project_urls={
diff --git a/src/launchpadlib/apps.py b/src/launchpadlib/apps.py
index e163a7b..df7720f 100644
--- a/src/launchpadlib/apps.py
+++ b/src/launchpadlib/apps.py
@@ -30,7 +30,7 @@ from launchpadlib.credentials import Credentials
 from launchpadlib.uris import lookup_web_root
 
 
-class RequestTokenApp(object):
+class RequestTokenApp:
     """An application that creates request tokens."""
 
     def __init__(self, web_root, consumer_name, context):
diff --git a/src/launchpadlib/bin/launchpad-request-token b/src/launchpadlib/bin/launchpad-request-token
index 8205b45..c81a23f 100755
--- a/src/launchpadlib/bin/launchpad-request-token
+++ b/src/launchpadlib/bin/launchpad-request-token
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # Copyright 2009 Canonical Ltd.
 
@@ -22,10 +22,6 @@ This script will create a Launchpad request token and print to STDOUT
 some JSON data about the token and the available access levels.
 """
 
-from __future__ import print_function
-
-__metaclass__ = type
-
 from optparse import OptionParser
 from launchpadlib.apps import RequestTokenApp
 
diff --git a/src/launchpadlib/credentials.py b/src/launchpadlib/credentials.py
index 5789fc0..abf55a2 100644
--- a/src/launchpadlib/credentials.py
+++ b/src/launchpadlib/credentials.py
@@ -14,11 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 """launchpadlib credentials and authentication support."""
 
-__metaclass__ = type
 __all__ = [
     "AccessToken",
     "AnonymousAccessToken",
@@ -29,40 +26,20 @@ __all__ = [
     "Credentials",
 ]
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
-
+from base64 import (
+    b64decode,
+    b64encode,
+)
 import httplib2
+from io import StringIO
 import json
 import os
 from select import select
 import stat
 from sys import stdin
 import time
-
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
-try:
-    from urllib.parse import urljoin
-except ImportError:
-    from urlparse import urljoin
+from urllib.parse import urlencode, urljoin, parse_qs
 import webbrowser
-from base64 import (
-    b64decode,
-    b64encode,
-)
-
-from six.moves.urllib.parse import parse_qs
-
-if bytes is str:
-    # Python 2
-    unicode_type = unicode  # noqa: F821
-else:
-    unicode_type = str
 
 from lazr.restfulclient.errors import HTTPError
 from lazr.restfulclient.authorize.oauth import (
@@ -135,7 +112,7 @@ class Credentials(OAuthAuthorizer):
         sio = StringIO()
         self.save(sio)
         serialized = sio.getvalue()
-        if isinstance(serialized, unicode_type):
+        if isinstance(serialized, str):
             serialized = serialized.encode("utf-8")
         return serialized
 
@@ -146,7 +123,7 @@ class Credentials(OAuthAuthorizer):
         This should probably be moved into OAuthAuthorizer.
         """
         credentials = cls()
-        if not isinstance(value, unicode_type):
+        if not isinstance(value, str):
             value = value.decode("utf-8")
         credentials.load(StringIO(value))
         return credentials
@@ -255,7 +232,7 @@ class AccessToken(_AccessToken):
     @classmethod
     def from_string(cls, query_string):
         """Create and return a new `AccessToken` from the given string."""
-        if not isinstance(query_string, unicode_type):
+        if not isinstance(query_string, str):
             query_string = query_string.decode("utf-8")
         params = parse_qs(query_string, keep_blank_values=False)
         key = params["oauth_token"]
@@ -280,10 +257,10 @@ class AnonymousAccessToken(_AccessToken):
     """
 
     def __init__(self):
-        super(AnonymousAccessToken, self).__init__("", "")
+        super().__init__("", "")
 
 
-class CredentialStore(object):
+class CredentialStore:
     """Store OAuth credentials locally.
 
     This is a generic superclass. To implement a specific way of
@@ -369,7 +346,7 @@ class KeyringCredentialStore(CredentialStore):
     B64MARKER = b"<B64>"
 
     def __init__(self, credential_save_failed=None, fallback=False):
-        super(KeyringCredentialStore, self).__init__(credential_save_failed)
+        super().__init__(credential_save_failed)
         self._fallback = None
         if fallback:
             self._fallback = MemoryCredentialStore(credential_save_failed)
@@ -438,7 +415,7 @@ class KeyringCredentialStore(CredentialStore):
             else:
                 raise
         if credential_string is not None:
-            if isinstance(credential_string, unicode_type):
+            if isinstance(credential_string, str):
                 credential_string = credential_string.encode("utf8")
             if credential_string.startswith(self.B64MARKER):
                 try:
@@ -468,9 +445,7 @@ class UnencryptedFileCredentialStore(CredentialStore):
     """
 
     def __init__(self, filename, credential_save_failed=None):
-        super(UnencryptedFileCredentialStore, self).__init__(
-            credential_save_failed
-        )
+        super().__init__(credential_save_failed)
         self.filename = filename
 
     def do_save(self, credentials, unique_key):
@@ -495,7 +470,7 @@ class MemoryCredentialStore(CredentialStore):
     """
 
     def __init__(self, credential_save_failed=None):
-        super(MemoryCredentialStore, self).__init__(credential_save_failed)
+        super().__init__(credential_save_failed)
         self._credentials = {}
 
     def do_save(self, credentials, unique_key):
@@ -507,7 +482,7 @@ class MemoryCredentialStore(CredentialStore):
         return self._credentials.get(unique_key)
 
 
-class RequestTokenAuthorizationEngine(object):
+class RequestTokenAuthorizationEngine:
     """The superclass of all request token authorizers.
 
     This base class does not implement request token authorization,
@@ -774,15 +749,13 @@ class AuthorizeRequestTokenWithBrowser(AuthorizeRequestTokenWithURL):
         # It doesn't look like we're doing anything here, but we
         # are discarding the passed-in values for consumer_name and
         # allow_access_levels.
-        super(AuthorizeRequestTokenWithBrowser, self).__init__(
+        super().__init__(
             service_root, application_name, None, credential_save_failed
         )
 
     def notify_end_user_authorization_url(self, authorization_url):
         """Notify the end-user of the URL."""
-        super(
-            AuthorizeRequestTokenWithBrowser, self
-        ).notify_end_user_authorization_url(authorization_url)
+        super().notify_end_user_authorization_url(authorization_url)
 
         try:
             browser_obj = webbrowser.get()
diff --git a/src/launchpadlib/docs/conf.py b/src/launchpadlib/docs/conf.py
index 268a8ce..235e7a9 100644
--- a/src/launchpadlib/docs/conf.py
+++ b/src/launchpadlib/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # launchpadlib documentation build configuration file, created by
 # sphinx-quickstart on Tue Nov  5 23:48:15 2019.
 #
@@ -47,9 +45,9 @@ source_suffix = ".rst"
 master_doc = "index"
 
 # General information about the project.
-project = u"launchpadlib"
-copyright = u"2008-2019, Canonical Ltd."
-author = u"LAZR Developers <[e-mail]>"
+project = "launchpadlib"
+copyright = "2008-2019, Canonical Ltd."
+author = "LAZR Developers <[e-mail]>"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -140,8 +138,8 @@ latex_documents = [
     (
         master_doc,
         "launchpadlib.tex",
-        u"launchpadlib Documentation",
-        u"LAZR Developers \\textless{}[e-mail]\\textgreater{}",  # noqa: E501
+        "launchpadlib Documentation",
+        "LAZR Developers \\textless{}[e-mail]\\textgreater{}",  # noqa: E501
         "manual",
     ),
 ]
@@ -152,7 +150,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, "launchpadlib", u"launchpadlib Documentation", [author], 1)
+    (master_doc, "launchpadlib", "launchpadlib Documentation", [author], 1)
 ]
 
 
@@ -165,7 +163,7 @@ texinfo_documents = [
     (
         master_doc,
         "launchpadlib",
-        u"launchpadlib Documentation",
+        "launchpadlib Documentation",
         author,
         "launchpadlib",
         "One line description of project.",
diff --git a/src/launchpadlib/launchpad.py b/src/launchpadlib/launchpad.py
index d8c6ba6..6b8cea6 100644
--- a/src/launchpadlib/launchpad.py
+++ b/src/launchpadlib/launchpad.py
@@ -16,18 +16,13 @@
 
 """Root Launchpad API class."""
 
-__metaclass__ = type
 __all__ = [
     "Launchpad",
 ]
 
 import errno
 import os
-
-try:
-    from urllib.parse import urlsplit
-except ImportError:
-    from urlparse import urlsplit
+from urllib.parse import urlsplit
 import warnings
 
 try:
@@ -130,7 +125,7 @@ class LaunchpadOAuthAwareHttp(RestfulHttp):
     def __init__(self, launchpad, authorization_engine, *args):
         self.launchpad = launchpad
         self.authorization_engine = authorization_engine
-        super(LaunchpadOAuthAwareHttp, self).__init__(*args)
+        super().__init__(*args)
 
     def _bad_oauth_token(self, response, content):
         """Helper method to detect an error caused by a bad OAuth token."""
@@ -141,9 +136,7 @@ class LaunchpadOAuthAwareHttp(RestfulHttp):
         )
 
     def _request(self, *args):
-        response, content = super(LaunchpadOAuthAwareHttp, self)._request(
-            *args
-        )
+        response, content = super()._request(*args)
         return self.retry_on_bad_token(response, content, *args)
 
     def retry_on_bad_token(self, response, content, *args):
@@ -227,7 +220,7 @@ class Launchpad(ServiceRoot):
         # case we need to authorize a new token during use.
         self.authorization_engine = authorization_engine
 
-        super(Launchpad, self).__init__(
+        super().__init__(
             credentials, service_root, cache, timeout, proxy_info, version
         )
 
diff --git a/src/launchpadlib/testing/helpers.py b/src/launchpadlib/testing/helpers.py
index e625f5e..c9a7cec 100644
--- a/src/launchpadlib/testing/helpers.py
+++ b/src/launchpadlib/testing/helpers.py
@@ -18,8 +18,6 @@
 
 """launchpadlib testing helpers."""
 
-
-__metaclass__ = type
 __all__ = [
     "BadSaveKeyring",
     "fake_keyring",
@@ -64,7 +62,7 @@ class NoNetworkAuthorizationEngine(RequestTokenAuthorizationEngine):
     ACCESS_TOKEN_KEY = "access_key:84"
 
     def __init__(self, *args, **kwargs):
-        super(NoNetworkAuthorizationEngine, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         # Set up some instrumentation.
         self.request_tokens_obtained = 0
         self.access_tokens_obtained = 0
@@ -144,7 +142,7 @@ class TestableLaunchpad(Launchpad):
             generally pass in fully-formed Credentials objects.
         :param service_root: Defaults to 'test_dev'.
         """
-        super(TestableLaunchpad, self).__init__(
+        super().__init__(
             credentials,
             authorization_engine,
             credential_store,
diff --git a/src/launchpadlib/testing/launchpad.py b/src/launchpadlib/testing/launchpad.py
index aa2ee6d..3edaad4 100644
--- a/src/launchpadlib/testing/launchpad.py
+++ b/src/launchpadlib/testing/launchpad.py
@@ -65,23 +65,15 @@ Where 'https://api.launchpad.net/devel/' is the URL for the WADL file, found
 also in the WADL file itelf.
 """
 
+from collections.abc import Callable
 from datetime import datetime
 
-try:
-    from collections.abc import Callable
-except ImportError:
-    from collections import Callable
-import sys
-
-if sys.version_info[0] >= 3:
-    basestring = str
-
 
 class IntegrityError(Exception):
     """Raised when bad sample data is used with a L{FakeLaunchpad} instance."""
 
 
-class FakeLaunchpad(object):
+class FakeLaunchpad:
     """A fake Launchpad API class for unit tests that depend on L{Launchpad}.
 
     @param application: A C{wadllib.application.Application} instance for a
@@ -188,7 +180,7 @@ def wadl_tag(tag_name):
     return "{http://research.sun.com/wadl/2006/10}" + tag_name
 
 
-class FakeResource(object):
+class FakeResource:
     """
     Represents valid sample data on L{FakeLaunchpad} instances.
 
@@ -434,7 +426,7 @@ class FakeResource(object):
             if param is None:
                 raise IntegrityError("%s not found" % name)
             if param.type is None:
-                if not isinstance(value, basestring):
+                if not isinstance(value, str):
                     raise IntegrityError(
                         "%s is not a str or unicode for %s" % (value, name)
                     )
@@ -594,7 +586,7 @@ class FakeRoot(FakeResource):
         resource_type = application.get_resource_type(
             application.markup_url + "#service-root"
         )
-        super(FakeRoot, self).__init__(application, resource_type)
+        super().__init__(application, resource_type)
 
 
 class FakeEntry(FakeResource):
@@ -612,9 +604,7 @@ class FakeCollection(FakeResource):
         name=None,
         child_resource_type=None,
     ):
-        super(FakeCollection, self).__init__(
-            application, resource_type, values
-        )
+        super().__init__(application, resource_type, values)
         self.__dict__.update(
             {"_name": name, "_child_resource_type": child_resource_type}
         )
diff --git a/src/launchpadlib/testing/tests/test_launchpad.py b/src/launchpadlib/testing/tests/test_launchpad.py
index c988d2b..cff4dd2 100644
--- a/src/launchpadlib/testing/tests/test_launchpad.py
+++ b/src/launchpadlib/testing/tests/test_launchpad.py
@@ -160,8 +160,8 @@ class FakeLaunchpadTest(ResourcedTestCase):
         dicts that represent objects.  Plain string values can be represented
         as C{unicode} strings.
         """
-        self.launchpad.me = dict(name=u"foo")
-        self.assertEqual(u"foo", self.launchpad.me.name)
+        self.launchpad.me = dict(name="foo")
+        self.assertEqual("foo", self.launchpad.me.name)
 
     def test_datetime_property(self):
         """
diff --git a/src/launchpadlib/tests/test_credential_store.py b/src/launchpadlib/tests/test_credential_store.py
index 3049fbe..b6fe597 100644
--- a/src/launchpadlib/tests/test_credential_store.py
+++ b/src/launchpadlib/tests/test_credential_store.py
@@ -169,9 +169,7 @@ class TestKeyringCredentialStore(CredentialStoreTestCase):
         # handled correctly.  (See bug lp:877374)
         class UnicodeInMemoryKeyring(InMemoryKeyring):
             def get_password(self, service, username):
-                password = super(UnicodeInMemoryKeyring, self).get_password(
-                    service, username
-                )
+                password = super().get_password(service, username)
                 if isinstance(password, unicode_type):
                     password = password.encode("utf-8")
                 return password
@@ -194,9 +192,7 @@ class TestKeyringCredentialStore(CredentialStoreTestCase):
 
         class UnencodedInMemoryKeyring(InMemoryKeyring):
             def get_password(self, service, username):
-                pw = super(UnencodedInMemoryKeyring, self).get_password(
-                    service, username
-                )
+                pw = super().get_password(service, username)
                 return b64decode(pw[5:])
 
         self.keyring = UnencodedInMemoryKeyring()
diff --git a/src/launchpadlib/tests/test_http.py b/src/launchpadlib/tests/test_http.py
index 6924e4f..e2287f6 100644
--- a/src/launchpadlib/tests/test_http.py
+++ b/src/launchpadlib/tests/test_http.py
@@ -17,15 +17,10 @@
 """Tests for the LaunchpadOAuthAwareHTTP class."""
 
 from collections import deque
-from json import dumps
+from json import dumps, JSONDecodeError
 import tempfile
 import unittest
 
-try:
-    from json import JSONDecodeError
-except ImportError:
-    JSONDecodeError = ValueError
-
 from launchpadlib.errors import Unauthorized
 from launchpadlib.credentials import UnencryptedFileCredentialStore
 from launchpadlib.launchpad import (
@@ -75,7 +70,7 @@ class SimulatedResponsesHttp(LaunchpadOAuthAwareHttp):
         :param responses: A list of HttpResponse objects to use
             in response to requests.
         """
-        super(SimulatedResponsesHttp, self).__init__(*args)
+        super().__init__(*args)
         self.sent_responses = []
         self.unsent_responses = responses
         self.cache = None
diff --git a/src/launchpadlib/tests/test_launchpad.py b/src/launchpadlib/tests/test_launchpad.py
index 66462c5..47410d5 100644
--- a/src/launchpadlib/tests/test_launchpad.py
+++ b/src/launchpadlib/tests/test_launchpad.py
@@ -16,8 +16,6 @@
 
 """Tests for the Launchpad class."""
 
-__metaclass__ = type
-
 from contextlib import contextmanager
 import os
 import shutil
@@ -25,11 +23,7 @@ import socket
 import stat
 import tempfile
 import unittest
-
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from unittest.mock import patch
 import warnings
 
 from lazr.restfulclient.resource import ServiceRoot
@@ -351,11 +345,11 @@ class TestLaunchpadLoginWith(KeyringTest):
     """Tests for Launchpad.login_with()."""
 
     def setUp(self):
-        super(TestLaunchpadLoginWith, self).setUp()
+        super().setUp()
         self.temp_dir = tempfile.mkdtemp()
 
     def tearDown(self):
-        super(TestLaunchpadLoginWith, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.temp_dir)
 
     def test_dirs_created(self):
diff --git a/src/launchpadlib/uris.py b/src/launchpadlib/uris.py
index dda802e..1bcc8f6 100644
--- a/src/launchpadlib/uris.py
+++ b/src/launchpadlib/uris.py
@@ -20,18 +20,15 @@ The code in this module lets users say "staging" when they mean
 "https://api.staging.launchpad.net/".
 """
 
-__metaclass__ = type
 __all__ = [
     "lookup_service_root",
     "lookup_web_root",
     "web_root_for_service_root",
 ]
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
 
+from urllib.parse import urlparse
 import warnings
+
 from lazr.uri import URI
 
 LPNET_SERVICE_ROOT = "https://api.launchpad.net/"
diff --git a/tox.ini b/tox.ini
index aaa62c9..ecde674 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 envlist =
-    py27,py35,py36,py37,py38,py39,py310,py311,lint,docs
+    py35,py36,py37,py38,py39,py310,py311,lint,docs
 requires = virtualenv<20.22
 
 [testenv]
 deps =
     .[test,testing]
 commands =
-    coverage run -m pytest src {posargs}
+    pytest src {posargs}
 
 [testenv:lint]
 # necessary to build the woke linter
@@ -34,17 +34,16 @@ deps =
     .[docs]
 
 [testenv:coverage]
-description = usage: tox -e py27,py35,py310,coverage
 basepython =
     python3
 deps =
     .[testing,test]
 commands =
+    coverage erase
+    coverage run -m pytest src {posargs}
     coverage combine
     coverage html
-    coverage report -m --fail-under=89
-depends =
-    py27,py35,py310
+    coverage report -m --fail-under=91
 
 [coverage:run]
 parallel=True