Remove some more py27-isms (#1062)

Author: alex

doc/conf.py

@@ -72,9 +72,9 @@ def find_version(*file_paths):
 master_doc = "index"
 
 # General information about the project.
-project = u"pyOpenSSL"
-authors = u"The pyOpenSSL developers"
-copyright = u"2001 " + authors
+project = "pyOpenSSL"
+authors = "The pyOpenSSL developers"
+copyright = "2001 " + authors
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -217,7 +217,7 @@ def find_version(*file_paths):
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual])
 latex_documents = [
-    ("index", "pyOpenSSL.tex", u"pyOpenSSL Documentation", authors, "manual"),
+    ("index", "pyOpenSSL.tex", "pyOpenSSL Documentation", authors, "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -248,7 +248,7 @@ def find_version(*file_paths):
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("index", "pyopenssl", u"pyOpenSSL Documentation", [authors], 1)]
+man_pages = [("index", "pyopenssl", "pyOpenSSL Documentation", [authors], 1)]
 
 intersphinx_mapping = {
     "https://docs.python.org/3": None,

pyproject.toml

@@ -1,4 +1,4 @@
 [tool.black]
 line-length = 79
-target-version = ["py27"]
+target-version = ["py36"]
 

src/OpenSSL/debug.py

@@ -10,7 +10,7 @@
 from . import version
 
 
-_env_info = u"""\
+_env_info = """\
 pyOpenSSL: {pyopenssl}
 cryptography: {cryptography}
 cffi: {cffi}

tests/test_crypto.py

@@ -2467,7 +2467,7 @@ def check_recovery(
                 b"-nodes",
                 b"-passin",
                 b"pass:" + passwd,
-                *extra
+                *extra,
             )
             assert recovered_key[-len(key) :] == key
         if cert:
@@ -2479,7 +2479,7 @@ def check_recovery(
                 b"-passin",
                 b"pass:" + passwd,
                 b"-nokeys",
-                *extra
+                *extra,
             )
             assert recovered_cert[-len(cert) :] == cert
         if ca:
@@ -2491,7 +2491,7 @@ def check_recovery(
                 b"-passin",
                 b"pass:" + passwd,
                 b"-nokeys",
-                *extra
+                *extra,
             )
             assert recovered_cert[-len(ca) :] == ca
 
@@ -3477,7 +3477,7 @@ def test_reason(self):
         revoked.set_reason(None)
         assert revoked.get_reason() is None
 
-    @pytest.mark.parametrize("reason", [object(), 1.0, u"foo"])
+    @pytest.mark.parametrize("reason", [object(), 1.0, "foo"])
     def test_set_reason_wrong_args(self, reason):
         """
         `Revoked.set_reason` raises `TypeError` if called with an argument
@@ -3553,12 +3553,12 @@ def test_export_pem(self):
         assert revoked is not None
         assert crl.issuer == x509.Name(
             [
-                x509.NameAttribute(x509.NameOID.COUNTRY_NAME, u"US"),
-                x509.NameAttribute(x509.NameOID.STATE_OR_PROVINCE_NAME, u"IL"),
-                x509.NameAttribute(x509.NameOID.LOCALITY_NAME, u"Chicago"),
-                x509.NameAttribute(x509.NameOID.ORGANIZATION_NAME, u"Testing"),
+                x509.NameAttribute(x509.NameOID.COUNTRY_NAME, "US"),
+                x509.NameAttribute(x509.NameOID.STATE_OR_PROVINCE_NAME, "IL"),
+                x509.NameAttribute(x509.NameOID.LOCALITY_NAME, "Chicago"),
+                x509.NameAttribute(x509.NameOID.ORGANIZATION_NAME, "Testing"),
                 x509.NameAttribute(
-                    x509.NameOID.COMMON_NAME, u"Testing Root CA"
+                    x509.NameOID.COMMON_NAME, "Testing Root CA"
                 ),
             ]
         )
@@ -3580,12 +3580,12 @@ def test_export_der(self):
         assert revoked is not None
         assert crl.issuer == x509.Name(
             [
-                x509.NameAttribute(x509.NameOID.COUNTRY_NAME, u"US"),
-                x509.NameAttribute(x509.NameOID.STATE_OR_PROVINCE_NAME, u"IL"),
-                x509.NameAttribute(x509.NameOID.LOCALITY_NAME, u"Chicago"),
-                x509.NameAttribute(x509.NameOID.ORGANIZATION_NAME, u"Testing"),
+                x509.NameAttribute(x509.NameOID.COUNTRY_NAME, "US"),
+                x509.NameAttribute(x509.NameOID.STATE_OR_PROVINCE_NAME, "IL"),
+                x509.NameAttribute(x509.NameOID.LOCALITY_NAME, "Chicago"),
+                x509.NameAttribute(x509.NameOID.ORGANIZATION_NAME, "Testing"),
                 x509.NameAttribute(
-                    x509.NameOID.COMMON_NAME, u"Testing Root CA"
+                    x509.NameOID.COMMON_NAME, "Testing Root CA"
                 ),
             ]
         )
@@ -4375,7 +4375,7 @@ def test_not_a_curve(self):
         does not identify a supported curve.
         """
         with pytest.raises(ValueError):
-            get_elliptic_curve(u"this curve was just invented")
+            get_elliptic_curve("this curve was just invented")
 
     def test_repr(self):
         """

tests/test_ssl.py

@@ -454,10 +454,10 @@ def ca_file(tmpdir):
 
     builder = x509.CertificateBuilder()
     builder = builder.subject_name(
-        x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, u"pyopenssl.org")])
+        x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, "pyopenssl.org")])
     )
     builder = builder.issuer_name(
-        x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, u"pyopenssl.org")])
+        x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, "pyopenssl.org")])
     )
     one_day = datetime.timedelta(1, 0, 0)
     builder = builder.not_valid_before(datetime.datetime.today() - one_day)
@@ -498,7 +498,7 @@ class TestContext(object):
 
     @pytest.mark.parametrize(
         "cipher_string",
-        [b"hello world:AES128-SHA", u"hello world:AES128-SHA"],
+        [b"hello world:AES128-SHA", "hello world:AES128-SHA"],
     )
     def test_set_cipher_list(self, context, cipher_string):
         """
@@ -588,7 +588,7 @@ def test_set_session_id_unicode(self, context):
         `Context.set_session_id` raises a warning if a unicode string is
         passed.
         """
-        pytest.deprecated_call(context.set_session_id, u"abc")
+        pytest.deprecated_call(context.set_session_id, "abc")
 
     def test_method(self):
         """
@@ -1708,7 +1708,7 @@ def test_set_tmp_ecdh(self):
         """
         context = Context(SSLv23_METHOD)
         for curve in get_elliptic_curves():
-            if curve.name.startswith(u"Oakley-"):
+            if curve.name.startswith("Oakley-"):
                 # Setting Oakley-EC2N-4 and Oakley-EC2N-3 adds
                 # ('bignum routines', 'BN_mod_inverse', 'no inverse') to the
                 # error queue on OpenSSL 1.0.2.
@@ -2068,7 +2068,7 @@ def test_alpn_select_cb_returns_invalid_value(self):
 
         def invalid_cb(conn, options):
             invalid_cb_args.append((conn, options))
-            return u"can't return unicode"
+            return "can't return unicode"
 
         client_context = Context(SSLv23_METHOD)
         client_context.set_alpn_protos([b"http/1.1", b"spdy/2"])
@@ -2235,7 +2235,7 @@ def test_bio_write(self):
         connection.bio_write(b"xy")
         connection.bio_write(bytearray(b"za"))
         with pytest.warns(DeprecationWarning):
-            connection.bio_write(u"deprecated")
+            connection.bio_write("deprecated")
 
     def test_get_context(self):
         """

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {pypy,pypy3,py27,py36,py37,py38,py39,py310}{,-cryptographyMain,-cryptographyMinimum}{,-useWheel}{,-randomorder},py37-twistedTrunk,pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = {pypy,pypy3,py36,py37,py38,py39,py310}{,-cryptographyMain,-cryptographyMinimum}{,-useWheel}{,-randomorder},py37-twistedTrunk,pypi-readme,check-manifest,flake8,docs,coverage-report
 
 [testenv]
 whitelist_externals =