Lint the code.

Add support for Python 3.9 and 3.10.

CHANGES.rst

@@ -4,7 +4,7 @@ Changelog
 4.2 (unreleased)
 ----------------
 
-- Add support for Python 3.8.
+- Add support for Python 3.8, 3.9 and 3.10.
 
 - Drop support for Python 3.4.
 

setup.py

@@ -23,10 +23,17 @@
     description="zExceptions contains common exceptions used in Zope.",
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
+    project_urls={
+        'Issue Tracker': 'https://github.com/zopefoundation/'
+                         'zExceptions/issues',
+        'Sources': 'https://github.com/zopefoundation/zExceptions',
+    },
+
     long_description=(open('README.rst').read() + '\n' +
                       open('CHANGES.rst').read()),
     packages=find_packages('src'),
     package_dir={'': 'src'},
+    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
     install_requires=[
         'setuptools',
         'zope.interface',
@@ -49,6 +56,8 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],

src/zExceptions/ExceptionFormatter.py

@@ -56,7 +56,7 @@ def getRevision(self, globals):
         if revision is not None:
             try:
                 revision = str(revision).strip()
-            except:
+            except:  # noqa: E722 do not use bare 'except'
                 revision = '???'
         return revision
 
@@ -156,7 +156,7 @@ def formatLine(self, tb):
             try:
                 supp = factory(*args)
                 result.extend(self.formatSupplement(supp, tb))
-            except:
+            except:  # noqa: E722 do not use bare 'except'
                 if DEBUG_EXCEPTION_FORMATTER:
                     import traceback
                     traceback.print_exc()
@@ -166,7 +166,7 @@ def formatLine(self, tb):
             tbi = locals.get('__traceback_info__', None)
             if tbi is not None:
                 result.append(self.formatTracebackInfo(tbi))
-        except:
+        except:  # noqa: E722 do not use bare 'except'
             pass
 
         return self.line_sep.join(result)

src/zExceptions/__init__.py

@@ -261,6 +261,7 @@ class Redirect(_HTTPMove):
     errmsg = 'Found'
     status = 302
 
+
 HTTPFound = Redirect  # Alias
 
 
@@ -304,6 +305,7 @@ class HTTPClientError(HTTPError):
 class BadRequest(HTTPClientError):
     pass
 
+
 HTTPBadRequest = BadRequest  # Alias
 
 
@@ -322,6 +324,7 @@ class Forbidden(HTTPException):
     errmsg = 'Forbidden'
     status = 403
 
+
 HTTPForbidden = Forbidden  # Alias
 
 
@@ -330,6 +333,7 @@ class NotFound(HTTPException):
     errmsg = 'Not Found'
     status = 404
 
+
 HTTPNotFound = NotFound  # Alias
 
 
@@ -338,6 +342,7 @@ class MethodNotAllowed(HTTPException):
     errmsg = 'Method Not Allowed'
     status = 405
 
+
 HTTPMethodNotAllowed = MethodNotAllowed  # Alias
 
 
@@ -416,6 +421,7 @@ class ResourceLockedError(HTTPException):
     errmsg = 'Locked'
     status = 423
 
+
 HTTPLocked = ResourceLockedError  # Alias
 
 
@@ -459,6 +465,7 @@ class HTTPServerError(HTTPError):
 class InternalError(HTTPServerError):
     pass
 
+
 HTTPInternalServerError = InternalError  # Alias
 
 

src/zExceptions/_compat.py

@@ -2,14 +2,14 @@
 
 
 PY3 = sys.version_info >= (3, 0)
-if PY3:
+if PY3:  # pragma: PY3
     import builtins
     class_types = type,
     string_types = (str, bytes)
     unicode = str
-else:
-    import __builtin__ as builtins  # noqa
+else:  # pragma: PY2
+    import __builtin__ as builtins  # noqa: F401 import unused
     from types import ClassType
     class_types = (type, ClassType)
-    string_types = basestring,
+    string_types = basestring,  # noqa: F821 undefined name 'basestring'
     unicode = unicode