Add support for Python 3.12 and drop EOL 3.7

.github/workflows/tests.yml

@@ -1,6 +1,6 @@
 name: Test Python-RSA
 
-on: [push]
+on: [push, pull_request, workflow_dispatch]
 
 permissions:
   contents: read
@@ -11,20 +11,21 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.7"
           - "3.8"
-          - "pypy3.8"
           - "3.9"
           - "pypy3.9"
           - "3.10"
+          - "pypy3.10"
           - "3.11"
+          - "3.12"
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.travis.yml

@@ -6,7 +6,6 @@ cache: pip
 # See: https://github.com/travis-ci/travis-ci/issues/3024
 
 python:
-  - "3.7"
   - "3.8"
   - "3.9"
   - "3.10"
@@ -18,7 +17,7 @@ install:
   - poetry install
 
 script:
-  - poetry run py.test tests/
+  - poetry run pytest tests/
 
 after_success:
   - poetry run coveralls

doc/conf.py

@@ -43,8 +43,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Python-RSA'
-copyright = u'2011-2019, Sybren A. Stüvel'
+project = 'Python-RSA'
+copyright = '2011-2019, Sybren A. Stüvel'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -180,8 +180,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'Python-RSA.tex', u'Python-RSA Documentation',
-     u'Sybren A. Stüvel', 'manual'),
+    ('index', 'Python-RSA.tex', 'Python-RSA Documentation',
+     'Sybren A. Stüvel', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -213,8 +213,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'python-rsa', u'Python-RSA Documentation',
-     [u'Sybren A. Stüvel'], 1)
+    ('index', 'python-rsa', 'Python-RSA Documentation',
+     ['Sybren A. Stüvel'], 1)
 ]
 
 todo_include_todos = True

pyproject.toml

@@ -21,6 +21,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
   "Topic :: Security :: Cryptography",
@@ -32,7 +33,7 @@ include = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.7, <4"
+python = ">=3.8, <4"
 pyasn1 = ">=0.1.3"
 
 [tool.poetry.dev-dependencies]

rsa/cli.py

@@ -178,7 +178,7 @@ def parse_cli(self) -> typing.Tuple[optparse.Values, typing.List[str]]:
     def read_key(self, filename: str, keyform: str) -> rsa.key.AbstractKey:
         """Reads a public or private key."""
 
-        print("Reading %s key from %s" % (self.keyname, filename), file=sys.stderr)
+        print("Reading {} key from {}".format(self.keyname, filename), file=sys.stderr)
         with open(filename, "rb") as keyfile:
             keydata = keyfile.read()
 

rsa/core.py

@@ -23,7 +23,7 @@ def assert_int(var: int, name: str) -> None:
     if isinstance(var, int):
         return
 
-    raise TypeError("%s should be an integer, not %s" % (name, var.__class__))
+    raise TypeError("{} should be an integer, not {}".format(name, var.__class__))
 
 
 def encrypt_int(message: int, ekey: int, n: int) -> int:

rsa/key.py

@@ -140,7 +140,7 @@ def _assert_format_exists(
         except KeyError as ex:
             formats = ", ".join(sorted(methods.keys()))
             raise ValueError(
-                "Unsupported format: %r, try one of %s" % (file_format, formats)
+                "Unsupported format: {!r}, try one of {}".format(file_format, formats)
             ) from ex
 
     def save_pkcs1(self, format: str = "PEM") -> bytes:

rsa/pkcs1.py

@@ -60,23 +60,21 @@
 """Hash methods supported by this library."""
 
 
-if sys.version_info >= (3, 6):
-    # Python 3.6 introduced SHA3 support.
-    HASH_ASN1.update(
-        {
-            "SHA3-256": b"\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x08\x05\x00\x04\x20",
-            "SHA3-384": b"\x30\x41\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x09\x05\x00\x04\x30",
-            "SHA3-512": b"\x30\x51\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x0a\x05\x00\x04\x40",
-        }
-    )
-
-    HASH_METHODS.update(
-        {
-            "SHA3-256": hashlib.sha3_256,
-            "SHA3-384": hashlib.sha3_384,
-            "SHA3-512": hashlib.sha3_512,
-        }
-    )
+HASH_ASN1.update(
+    {
+        "SHA3-256": b"\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x08\x05\x00\x04\x20",
+        "SHA3-384": b"\x30\x41\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x09\x05\x00\x04\x30",
+        "SHA3-512": b"\x30\x51\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x0a\x05\x00\x04\x40",
+    }
+)
+
+HASH_METHODS.update(
+    {
+        "SHA3-256": hashlib.sha3_256,
+        "SHA3-384": hashlib.sha3_384,
+        "SHA3-512": hashlib.sha3_512,
+    }
+)
 
 
 class CryptoError(Exception):

rsa/util.py

@@ -67,7 +67,7 @@ def private_to_public() -> None:
     # Read the input data
     if cli.infilename:
         print(
-            "Reading private key from %s in %s format" % (cli.infilename, cli.inform),
+            "Reading private key from {} in {} format".format(cli.infilename, cli.inform),
             file=sys.stderr,
         )
         with open(cli.infilename, "rb") as infile:
@@ -87,7 +87,7 @@ def private_to_public() -> None:
 
     if cli.outfilename:
         print(
-            "Writing public key to %s in %s format" % (cli.outfilename, cli.outform),
+            "Writing public key to {} in {} format".format(cli.outfilename, cli.outform),
             file=sys.stderr,
         )
         with open(cli.outfilename, "wb") as outfile:

setup.cfg

@@ -9,7 +9,7 @@ max-complexity = 10
 max-line-length = 100
 
 [mypy]
-python_version = 3.7
+python_version = 3.8
 warn_unused_ignores = True
 ignore_missing_imports = True
 follow_imports = skip

tests/test_cli.py

@@ -2,7 +2,6 @@
 Unit tests for CLI entry points.
 """
 
-from __future__ import print_function
 
 import functools
 import io

tests/test_strings.py

@@ -14,13 +14,12 @@
 
 """Tests string operations."""
 
-from __future__ import absolute_import
 
 import unittest
 
 import rsa
 
-unicode_string = u"Euro=\u20ac ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+unicode_string = "Euro=\u20ac ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 
 class StringTest(unittest.TestCase):

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 # Environment changes have to be manually synced with '.travis.yml'.
-envlist = py37,py38,py39,py310,py311
+envlist = py{38,39,310,311,312}
 isolated_build = True
 
 [pytest]
@@ -10,10 +10,4 @@ addopts = -v --cov rsa --cov-report term-missing
 deps = poetry
 commands =
     poetry install
-    poetry run py.test tests/
-
-[testenv:py37]
-whitelist_externals = poetry
-commands=
-    poetry install
-    poetry run py.test --doctest-modules rsa tests/
+    poetry run pytest tests/