So this is separate from the patch series itself in a way, but it brings a question to mind: On Wed, 28 Oct 2020 15:23:10 +0100 Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> wrote: > +# We can't assume that six is installed > +PY3 = sys.version_info[0] == 3 > +PY2 = sys.version_info[0] == 2 > +if PY3: > + # pylint: disable=C0103, W0622 > + unicode = str > + basestring = str I wonder how much longer we really need to support any of: - Python < 3.n (where n=5 or 6 maybe) - Sphinx < 1.7 or even some 2.x We're carrying a certain and growing amount of cruft to handle these cases. I might start putting together a series to clean this up for 5.11 or so. jon