Upgrade Python syntax with pyupgrade --py38-plus

Author: hugovk

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

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/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:

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):