Use f-string (#928)

PyMySQL · Jan 4, 2021 · 3818ad0 · 3818ad0
1 parent d9b67a3
commit 3818ad0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -1331,7 +1331,7 @@ def _get_descriptions(self):
             if converter is converters.through:
                 converter = None
             if DEBUG:
-                print("DEBUG: field={}, converter={}".format(field, converter))
+                print(f"DEBUG: field={field}, converter={converter}")
             self.converters.append((encoding, converter))
 
         eof_packet = self.connection._read_packet()
@@ -1361,9 +1361,7 @@ def send_data(self):
                         break
                     conn.write_packet(chunk)
         except IOError:
-            raise err.OperationalError(
-                1017, "Can't find file '{0}'".format(self.filename)
-            )
+            raise err.OperationalError(1017, f"Can't find file '{self.filename}'")
         finally:
             # send the empty packet to signify we are done sending data
             conn.write_packet(b"")
diff --git a/pymysql/cursors.py b/pymysql/cursors.py
@@ -242,7 +242,7 @@ def callproc(self, procname, args=()):
         """
         conn = self._get_db()
         if args:
-            fmt = "@_{0}_%d=%s".format(procname)
+            fmt = f"@_{procname}_%d=%s"
             self._query(
                 "SET %s"
                 % ",".join(

diff --git a/pymysql/protocol.py b/pymysql/protocol.py
@@ -323,9 +323,7 @@ class EOFPacketWrapper:
     def __init__(self, from_packet):
         if not from_packet.is_eof_packet():
             raise ValueError(
-                "Cannot create '{0}' object from invalid packet type".format(
-                    self.__class__
-                )
+                f"Cannot create '{self.__class__}' object from invalid packet type"
             )
 
         self.packet = from_packet
@@ -348,9 +346,7 @@ class LoadLocalPacketWrapper:
     def __init__(self, from_packet):
         if not from_packet.is_load_local_packet():
             raise ValueError(
-                "Cannot create '{0}' object from invalid packet type".format(
-                    self.__class__
-                )
+                f"Cannot create '{self.__class__}' object from invalid packet type"
             )
 
         self.packet = from_packet

diff --git a/pymysql/tests/test_load_local.py b/pymysql/tests/test_load_local.py
@@ -35,10 +35,7 @@ def test_load_file(self):
         )
         try:
             c.execute(
-                (
-                    "LOAD DATA LOCAL INFILE '{0}' INTO TABLE "
-                    + "test_load_local FIELDS TERMINATED BY ','"
-                ).format(filename)
+                f"LOAD DATA LOCAL INFILE '{filename}' INTO TABLE test_load_local FIELDS TERMINATED BY ','"
             )
             c.execute("SELECT COUNT(*) FROM test_load_local")
             self.assertEqual(22749, c.fetchone()[0])
@@ -55,10 +52,7 @@ def test_unbuffered_load_file(self):
         )
         try:
             c.execute(
-                (
-                    "LOAD DATA LOCAL INFILE '{0}' INTO TABLE "
-                    + "test_load_local FIELDS TERMINATED BY ','"
-                ).format(filename)
+                f"LOAD DATA LOCAL INFILE '{filename}' INTO TABLE test_load_local FIELDS TERMINATED BY ','"
             )
             c.execute("SELECT COUNT(*) FROM test_load_local")
             self.assertEqual(22749, c.fetchone()[0])