From: Michał Kępień <michal@isc.org>
Date: Thu, 16 Sep 2021 06:22:01 +0000 (+0200)
Subject: Remove redundant prefix from Python 3 strings
X-Git-Tag: v9.17.19~37^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5944bc610fa45902e89c4173d0b7b124876c82b;p=thirdparty%2Fbind9.git

Remove redundant prefix from Python 3 strings

Address the following warnings reported by PyLint 2.10.2:

    ************* Module conf
    doc/arm/conf.py:90:10: W1406: The u prefix for strings is no longer necessary in Python >=3.0 (redundant-u-string-prefix)
    doc/arm/conf.py:92:12: W1406: The u prefix for strings is no longer necessary in Python >=3.0 (redundant-u-string-prefix)
    doc/arm/conf.py:93:9: W1406: The u prefix for strings is no longer necessary in Python >=3.0 (redundant-u-string-prefix)
    doc/arm/conf.py:143:31: W1406: The u prefix for strings is no longer necessary in Python >=3.0 (redundant-u-string-prefix)
    doc/man/conf.py:33:10: W1406: The u prefix for strings is no longer necessary in Python >=3.0 (redundant-u-string-prefix)
    doc/man/conf.py:38:12: W1406: The u prefix for strings is no longer necessary in Python >=3.0 (redundant-u-string-prefix)
    doc/man/conf.py:39:9: W1406: The u prefix for strings is no longer necessary in Python >=3.0 (redundant-u-string-prefix)
---

diff --git a/doc/arm/conf.py b/doc/arm/conf.py
index 1458fe9f470..b8aca9b33c9 100644
--- a/doc/arm/conf.py
+++ b/doc/arm/conf.py
@@ -87,10 +87,10 @@ def setup(_):
 
 # -- Project information -----------------------------------------------------
 
-project = u'BIND 9'
+project = 'BIND 9'
 # pylint: disable=redefined-builtin
-copyright = u'2021, Internet Systems Consortium'
-author = u'Internet Systems Consortium'
+copyright = '2021, Internet Systems Consortium'
+author = 'Internet Systems Consortium'
 
 # -- General configuration ---------------------------------------------------
 
@@ -140,7 +140,7 @@ latex_engine = 'xelatex'
 
 # pylint disable=line-too-long
 latex_documents = [
-    (master_doc, 'Bv9ARM.tex', u'BIND 9 Administrator Reference Manual', author, 'manual'),
+    (master_doc, 'Bv9ARM.tex', 'BIND 9 Administrator Reference Manual', author, 'manual'),
     ]
 
 latex_logo = "isc-logo.pdf"
diff --git a/doc/man/conf.py b/doc/man/conf.py
index 8b4e37c777e..6395cf09745 100644
--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@@ -30,13 +30,13 @@
 
 # -- Project information -----------------------------------------------------
 
-project = u'BIND 9'
+project = 'BIND 9'
 # pylint: disable=wrong-import-position
 import datetime
 year = datetime.datetime.now().year
 # pylint: disable=redefined-builtin
-copyright = u"%d, Internet Systems Consortium" % year
-author = u'Internet Systems Consortium'
+copyright = "%d, Internet Systems Consortium" % year
+author = 'Internet Systems Consortium'
 
 # -- General configuration ---------------------------------------------------