Remove redundant Python 2 code (#671)

* Remove Python 2 code * Upgrade Python syntax with pyupgrade --py3-plus * Post-Black cleanup: explicitly join implicitly concatenated strings
pyca · Jul 28, 2021 · 56f3b9b · 56f3b9b
1 parent 822ea1a
commit 56f3b9b
Show file tree

Hide file tree

Showing 52 changed files with 95 additions and 157 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # This file is execfile()d with the current directory set to its containing dir
 #

diff --git a/docs/vectors/python/argondriver.py b/docs/vectors/python/argondriver.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 #
-from __future__ import division, print_function
 
 import argparse
 import json
@@ -10,7 +9,7 @@
 import sys
 
 
-class argonRunner(object):
+class argonRunner:
     GOODCHARS = string.ascii_letters + string.digits
 
     def __init__(self, args):
@@ -37,11 +36,11 @@ def _runOnce(self, passwd, salt, dgst_len, maxmem, iters):
             self.exe,
             salt.encode("ascii"),
             "-t",
-            "{0:2d}".format(iters),
+            "{:2d}".format(iters),
             "-m",
-            "{0:2d}".format(maxmem),
+            "{:2d}".format(maxmem),
             "-l",
-            "{0:3d}".format(dgst_len),
+            "{:3d}".format(dgst_len),
             "-v",
             self.version,
         ]

diff --git a/release.py b/release.py
@@ -2,7 +2,6 @@
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
 
-from __future__ import absolute_import, division, print_function
 
 import getpass
 import glob
@@ -19,7 +18,7 @@
 
 
 def run(*args, **kwargs):
-    print("[running] {0}".format(list(args)))
+    print("[running] {}".format(list(args)))
     subprocess.check_call(list(args), **kwargs)
 
 
@@ -122,12 +121,12 @@ def release(version):
     """
     github_token = getpass.getpass("Github person access token: ")
 
-    run("git", "tag", "-s", version, "-m", "{0} release".format(version))
+    run("git", "tag", "-s", version, "-m", "{} release".format(version))
     run("git", "push", "--tags")
 
     run("python", "setup.py", "sdist")
 
-    packages = glob.glob("dist/PyNaCl-{0}*".format(version))
+    packages = glob.glob("dist/PyNaCl-{}*".format(version))
     run("twine", "upload", "-s", *packages)
 
     github_actions_wheel_paths = build_github_actions_wheels(

diff --git a/setup.py b/setup.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 import errno
 import functools

diff --git a/src/bindings/build.py b/src/bindings/build.py
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
 
 import glob
 import os.path
@@ -36,7 +35,7 @@
 ffi = FFI()
 
 for header in HEADERS:
-    with open(header, "r") as hfile:
+    with open(header) as hfile:
         ffi.cdef(hfile.read())
 
 source = []
@@ -51,7 +50,7 @@
 source.append("#include <sodium.h>")
 
 for header in MINIMAL_HEADERS:
-    with open(header, "r") as hfile:
+    with open(header) as hfile:
         source.append(hfile.read())
 
 if sys.platform == "win32":

diff --git a/src/nacl/__init__.py b/src/nacl/__init__.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 __all__ = [
     "__title__",
@@ -27,7 +26,7 @@
 
 __title__ = "PyNaCl"
 __summary__ = (
-    "Python binding to the Networking and Cryptography (NaCl) " "library"
+    "Python binding to the Networking and Cryptography (NaCl) library"
 )
 __uri__ = "https://github.com/pyca/pynacl/"
 
@@ -37,4 +36,4 @@
 __email__ = "cryptography-dev@python.org"
 
 __license__ = "Apache License 2.0"
-__copyright__ = "Copyright 2013-2018 {0}".format(__author__)
+__copyright__ = "Copyright 2013-2018 {}".format(__author__)
diff --git a/src/nacl/bindings/__init__.py b/src/nacl/bindings/__init__.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 from nacl.bindings.crypto_aead import (
     crypto_aead_chacha20poly1305_ABYTES,

diff --git a/src/nacl/bindings/crypto_aead.py b/src/nacl/bindings/crypto_aead.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 from nacl import exceptions as exc
 from nacl._sodium import ffi, lib
@@ -109,7 +108,7 @@ def crypto_aead_chacha20poly1305_ietf_encrypt(message, aad, nonce, key):
 
     ensure(
         mlen <= crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX,
-        "Message must be at most {0} bytes long".format(
+        "Message must be at most {} bytes long".format(
             crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
         ),
         raising=exc.ValueError,
@@ -124,7 +123,7 @@ def crypto_aead_chacha20poly1305_ietf_encrypt(message, aad, nonce, key):
     ensure(
         isinstance(nonce, bytes)
         and len(nonce) == crypto_aead_chacha20poly1305_ietf_NPUBBYTES,
-        "Nonce must be a {0} bytes long bytes sequence".format(
+        "Nonce must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_ietf_NPUBBYTES
         ),
         raising=exc.TypeError,
@@ -133,7 +132,7 @@ def crypto_aead_chacha20poly1305_ietf_encrypt(message, aad, nonce, key):
     ensure(
         isinstance(key, bytes)
         and len(key) == crypto_aead_chacha20poly1305_ietf_KEYBYTES,
-        "Key must be a {0} bytes long bytes sequence".format(
+        "Key must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_ietf_KEYBYTES
         ),
         raising=exc.TypeError,
@@ -186,7 +185,7 @@ def crypto_aead_chacha20poly1305_ietf_decrypt(ciphertext, aad, nonce, key):
 
     ensure(
         clen <= _aead_chacha20poly1305_ietf_CRYPTBYTES_MAX,
-        "Ciphertext must be at most {0} bytes long".format(
+        "Ciphertext must be at most {} bytes long".format(
             _aead_chacha20poly1305_ietf_CRYPTBYTES_MAX
         ),
         raising=exc.ValueError,
@@ -201,7 +200,7 @@ def crypto_aead_chacha20poly1305_ietf_decrypt(ciphertext, aad, nonce, key):
     ensure(
         isinstance(nonce, bytes)
         and len(nonce) == crypto_aead_chacha20poly1305_ietf_NPUBBYTES,
-        "Nonce must be a {0} bytes long bytes sequence".format(
+        "Nonce must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_ietf_NPUBBYTES
         ),
         raising=exc.TypeError,
@@ -210,7 +209,7 @@ def crypto_aead_chacha20poly1305_ietf_decrypt(ciphertext, aad, nonce, key):
     ensure(
         isinstance(key, bytes)
         and len(key) == crypto_aead_chacha20poly1305_ietf_KEYBYTES,
-        "Key must be a {0} bytes long bytes sequence".format(
+        "Key must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_ietf_KEYBYTES
         ),
         raising=exc.TypeError,
@@ -263,7 +262,7 @@ def crypto_aead_chacha20poly1305_encrypt(message, aad, nonce, key):
 
     ensure(
         mlen <= crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX,
-        "Message must be at most {0} bytes long".format(
+        "Message must be at most {} bytes long".format(
             crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX
         ),
         raising=exc.ValueError,
@@ -278,7 +277,7 @@ def crypto_aead_chacha20poly1305_encrypt(message, aad, nonce, key):
     ensure(
         isinstance(nonce, bytes)
         and len(nonce) == crypto_aead_chacha20poly1305_NPUBBYTES,
-        "Nonce must be a {0} bytes long bytes sequence".format(
+        "Nonce must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_NPUBBYTES
         ),
         raising=exc.TypeError,
@@ -287,7 +286,7 @@ def crypto_aead_chacha20poly1305_encrypt(message, aad, nonce, key):
     ensure(
         isinstance(key, bytes)
         and len(key) == crypto_aead_chacha20poly1305_KEYBYTES,
-        "Key must be a {0} bytes long bytes sequence".format(
+        "Key must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_KEYBYTES
         ),
         raising=exc.TypeError,
@@ -341,7 +340,7 @@ def crypto_aead_chacha20poly1305_decrypt(ciphertext, aad, nonce, key):
 
     ensure(
         clen <= _aead_chacha20poly1305_CRYPTBYTES_MAX,
-        "Ciphertext must be at most {0} bytes long".format(
+        "Ciphertext must be at most {} bytes long".format(
             _aead_chacha20poly1305_CRYPTBYTES_MAX
         ),
         raising=exc.ValueError,
@@ -356,7 +355,7 @@ def crypto_aead_chacha20poly1305_decrypt(ciphertext, aad, nonce, key):
     ensure(
         isinstance(nonce, bytes)
         and len(nonce) == crypto_aead_chacha20poly1305_NPUBBYTES,
-        "Nonce must be a {0} bytes long bytes sequence".format(
+        "Nonce must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_NPUBBYTES
         ),
         raising=exc.TypeError,
@@ -365,7 +364,7 @@ def crypto_aead_chacha20poly1305_decrypt(ciphertext, aad, nonce, key):
     ensure(
         isinstance(key, bytes)
         and len(key) == crypto_aead_chacha20poly1305_KEYBYTES,
-        "Key must be a {0} bytes long bytes sequence".format(
+        "Key must be a {} bytes long bytes sequence".format(
             crypto_aead_chacha20poly1305_KEYBYTES
         ),
         raising=exc.TypeError,
@@ -418,7 +417,7 @@ def crypto_aead_xchacha20poly1305_ietf_encrypt(message, aad, nonce, key):
 
     ensure(
         mlen <= crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX,
-        "Message must be at most {0} bytes long".format(
+        "Message must be at most {} bytes long".format(
             crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
         ),
         raising=exc.ValueError,
@@ -433,7 +432,7 @@ def crypto_aead_xchacha20poly1305_ietf_encrypt(message, aad, nonce, key):
     ensure(
         isinstance(nonce, bytes)
         and len(nonce) == crypto_aead_xchacha20poly1305_ietf_NPUBBYTES,
-        "Nonce must be a {0} bytes long bytes sequence".format(
+        "Nonce must be a {} bytes long bytes sequence".format(
             crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
         ),
         raising=exc.TypeError,
@@ -442,7 +441,7 @@ def crypto_aead_xchacha20poly1305_ietf_encrypt(message, aad, nonce, key):
     ensure(
         isinstance(key, bytes)
         and len(key) == crypto_aead_xchacha20poly1305_ietf_KEYBYTES,
-        "Key must be a {0} bytes long bytes sequence".format(
+        "Key must be a {} bytes long bytes sequence".format(
             crypto_aead_xchacha20poly1305_ietf_KEYBYTES
         ),
         raising=exc.TypeError,
@@ -496,7 +495,7 @@ def crypto_aead_xchacha20poly1305_ietf_decrypt(ciphertext, aad, nonce, key):
 
     ensure(
         clen <= _aead_xchacha20poly1305_ietf_CRYPTBYTES_MAX,
-        "Ciphertext must be at most {0} bytes long".format(
+        "Ciphertext must be at most {} bytes long".format(
             _aead_xchacha20poly1305_ietf_CRYPTBYTES_MAX
         ),
         raising=exc.ValueError,
@@ -511,7 +510,7 @@ def crypto_aead_xchacha20poly1305_ietf_decrypt(ciphertext, aad, nonce, key):
     ensure(
         isinstance(nonce, bytes)
         and len(nonce) == crypto_aead_xchacha20poly1305_ietf_NPUBBYTES,
-        "Nonce must be a {0} bytes long bytes sequence".format(
+        "Nonce must be a {} bytes long bytes sequence".format(
             crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
         ),
         raising=exc.TypeError,
@@ -520,7 +519,7 @@ def crypto_aead_xchacha20poly1305_ietf_decrypt(ciphertext, aad, nonce, key):
     ensure(
         isinstance(key, bytes)
         and len(key) == crypto_aead_xchacha20poly1305_ietf_KEYBYTES,
-        "Key must be a {0} bytes long bytes sequence".format(
+        "Key must be a {} bytes long bytes sequence".format(
             crypto_aead_xchacha20poly1305_ietf_KEYBYTES
         ),
         raising=exc.TypeError,

diff --git a/src/nacl/bindings/crypto_box.py b/src/nacl/bindings/crypto_box.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 from nacl import exceptions as exc
 from nacl._sodium import ffi, lib
@@ -300,7 +299,7 @@ def crypto_box_seal_open(ciphertext, pk, sk):
 
     ensure(
         _clen >= crypto_box_SEALBYTES,
-        ("Input cyphertext must be " "at least {} long").format(
+        ("Input cyphertext must be at least {} long").format(
             crypto_box_SEALBYTES
         ),
         raising=exc.TypeError,

diff --git a/src/nacl/bindings/crypto_core.py b/src/nacl/bindings/crypto_core.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 from nacl import exceptions as exc
 from nacl._sodium import ffi, lib

diff --git a/src/nacl/bindings/crypto_generichash.py b/src/nacl/bindings/crypto_generichash.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 from nacl import exceptions as exc
 from nacl._sodium import ffi, lib
@@ -137,7 +136,7 @@ def generichash_blake2b_salt_personal(
     return ffi.buffer(digest, digest_size)[:]
 
 
-class Blake2State(object):
+class Blake2State:
     """
     Python-level wrapper for the crypto_generichash_blake2b state buffer
     """

diff --git a/src/nacl/bindings/crypto_hash.py b/src/nacl/bindings/crypto_hash.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import, division, print_function
 
 from nacl import exceptions as exc
 from nacl._sodium import ffi, lib