refactor: removed format string by test_basic.py

Author: mirageoasis

.github/workflows/lint.yml

@@ -19,4 +19,4 @@ jobs:
           pip install ruff black
 
       - name: Run lint script
-        run: bash scripts/lint.sh
+        run: bash scripts/lint.sh

.mariadb/my.cnf

@@ -20,4 +20,4 @@ loose_file_key_management_filename = /opt/key_file/no_encryption_key.key
 # file_key_management_encryption_algorithm=aes_ctr
 
 # Set encrypt_binlog
-encrypt_binlog=ON
+encrypt_binlog=ON

.mariadb/no_encryption_key.key

@@ -1 +1 @@
-1;dda0ccb18a28b0b4c2448b5f0217a134
+1;dda0ccb18a28b0b4c2448b5f0217a134

.mysql/dev.mysql.com.gpg.key

@@ -435,4 +435,3 @@ Pw1yjWJT1IhUBBgRAgAMBQJOdz3tBQkT+wG4ABIHZUdQRwABAQkQjHGNO1By4fUU
 mwCbBYr2+bBEn/L2BOcnw9Z/QFWuhRMAoKVgCFm5fadQ3Afi+UQlAcOphrnJ
 =tUml
 -----END PGP PUBLIC KEY BLOCK-----
-

.pre-commit-config.yaml

@@ -16,4 +16,4 @@ repos:
 -   repo: https://github.com/psf/black
     rev: 23.7.0
     hooks:
-    -   id: black
+    -   id: black

CHANGELOG

@@ -84,7 +84,7 @@
 * PyMYSQL 0.7
 * Add more contributors
 
-0.10 30/11/2016 
+0.10 30/11/2016
 * row-events: TIME is now encoded as python.timedelta
 * Allow users to define ctl_connection_settings and the option to fail when table information is unavailable (#176)
 * Decode gtid from network packet
@@ -128,7 +128,7 @@
 
 0.19 29/04/2019
 * Fix Insert NULL in a boolean column returns no rows #288
-* Added empty string support for enum 
+* Added empty string support for enum
 * Fix column order
 * Fix float problem about time fieldtype
 
@@ -168,7 +168,7 @@
 * Add support for MariaDB GTID
 
 0.29 08/04/2022
-* Skip db name parsing if mts_accessed_dbs == 254 
+* Skip db name parsing if mts_accessed_dbs == 254
 
 0.30 28/04/2022
 * Fix decoding large json arrays
@@ -231,4 +231,3 @@
 
 1.0.2 05/10/2023
 * Delete charset_list.csv and add directly in CHARSET.py
-

CONTRIBUTING.md

@@ -48,4 +48,4 @@ However, please note that skipping hooks might lead to CI failures if we use the
 
 ---
 
-That's it! With these steps, you should be well on your way to contributing to `python-mysql-replication`. We look forward to your contributions! 
+That's it! With these steps, you should be well on your way to contributing to `python-mysql-replication`. We look forward to your contributions!

README.md

@@ -43,7 +43,7 @@ Project status
 ================
 
 The project is test with:
-* MySQL 5.5, 5.6 and 5.7 (v0.1 ~ v0.45) 
+* MySQL 5.5, 5.6 and 5.7 (v0.1 ~ v0.45)
 * MySQL 8.0.14 (v1.0 ~)
 * Python 3.3, 3.4, 3.5 and 3.6 (3.2 is not supported)
 * PyPy (really faster than the standard Python interpreter)
@@ -296,7 +296,7 @@ Similar projects
 * MySQL Hadoop Applier: C++ version http://dev.mysql.com/tech-resources/articles/mysql-hadoop-applier.html
 * Java: https://github.com/shyiko/mysql-binlog-connector-java
 * GO: https://github.com/siddontang/go-mysql
-* PHP: Based on this this project https://github.com/krowinski/php-mysql-replication and https://github.com/fengxiangyun/mysql-replication 
+* PHP: Based on this this project https://github.com/krowinski/php-mysql-replication and https://github.com/fengxiangyun/mysql-replication
 * .NET: https://github.com/SciSharp/dotnet-mysql-replication
 * .NET Core: https://github.com/rusuly/MySqlCdc
 
@@ -346,14 +346,14 @@ Other contributors:
 * Keegan Parker: secondary database for reference schema https://github.com/kdparker
 * Troy J. Farrell Clear table_map if RotateEvent has timestamp of 0 https://github.com/troyjfarrell
 * Zhanwei Wang Fail to get table informations https://github.com/wangzw
-* Alexander Ignatov Fix the JSON literal 
+* Alexander Ignatov Fix the JSON literal
 * Garen Chan Support PyMysql with a version greater than 0.9.3  https://github.com/garenchan
-* Mike Ascah: Add logic to handle inlined ints in large json documents ttps://github.com/mascah 
+* Mike Ascah: Add logic to handle inlined ints in large json documents ttps://github.com/mascah
 * Hiroaki Kawai: PyMySQL 1.0 support (https://github.com/hkwi)
 * Dongwook Chan: Support for ZEROFILL, Correct timedelta value for negative MySQL TIME datatype, Fix parsing of row events for MySQL8 partitioned table, Parse status variables in query event, Parse status variables in query event , Fix parse errors with MariaDB (https://github.com/dongwook-chan)
 * Paul Vickers: Add support for specifying an end log_pos (https://github.com/paulvic)
 * Samira El Aabidi: Add support for MariaDB GTID (https://github.com/Samira-El)
-* Oliver Seemann: Handle large json, github actions, 
+* Oliver Seemann: Handle large json, github actions,
 Zero-pad fixed-length binary fields (https://github.com/oseemann)
 * Mahadir Ahmad: Handle null json payload (https://github.com/mahadirz)
 * Axel Viala: Removal of Python 2.7 (https://github.com/darnuria)
@@ -376,5 +376,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 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.
-
-

docker-compose-test.yml

@@ -80,15 +80,15 @@ services:
       - -ce
       - |
         echo "wait mysql server"
-        
+
         while :
         do
           if mysql -h percona-5.7 --user=root --execute "SELECT version();" 2>&1 >/dev/null && mysql -h percona-5.7-ctl --user=root --execute "SELECT version();" 2>&1 >/dev/null && mysql -h percona-8.0 --user=root --execute "SELECT version();" 2>&1 >/dev/null; then
             break
           fi
           sleep 1
         done
-        
+
         echo "run pytest"
         pytest -k "not test_no_trailing_rotate_event and not test_end_log_pos"
 

docs/developement.rst

@@ -55,7 +55,7 @@ Running mysql in docker (main):
 Running mysql in docker (for ctl server):
 
 ::
-    
+
     docker run --name python-mysql-replication-tests-ctl --expose=3307 -e MYSQL_ALLOW_EMPTY_PASSWORD=true -p 3307:3307 --rm percona:latest --log-bin=mysql-bin.log --server-id 1 --binlog-format=row --gtid_mode=on --enforce-gtid-consistency=on --log_slave-updates -P 3307
 
 
@@ -73,4 +73,3 @@ build it using Sphinx:
     cd docs
     pip install sphinx
     make html
-

docs/index.rst

@@ -39,4 +39,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

examples/logstash/logstash-simple.conf

@@ -5,7 +5,7 @@ input {
         debug => true
     }
 }
-output { 
+output {
   stdout { debug => true debug_format => "json"}
   elasticsearch { embedded => true }
 }

pymysqlreplication/binlogstream.py

@@ -563,8 +563,8 @@ def __check_optional_meta_data(self):
                 logging.log(
                     logging.WARN,
                     """
-                       Setting The Variable Value BINLOG_ROW_METADATA = FULL, BINLOG_ROW_IMAGE = FULL. 
-                       By Applying this, provide properly mapped column information on UPDATE,DELETE,INSERT. 
+                       Setting The Variable Value BINLOG_ROW_METADATA = FULL, BINLOG_ROW_IMAGE = FULL.
+                       By Applying this, provide properly mapped column information on UPDATE,DELETE,INSERT.
                         """,
                 )
             else:

pymysqlreplication/constants/STATUS_VAR_KEY.py

@@ -2,7 +2,7 @@
 
 # class StatusVarsKey(IntEnum):
 """List of Query_event_status_vars
-    
+
     A status variable in query events is a sequence of status KEY-VALUE pairs.
     The class variables enumerated below are KEYs.
     Each KEY determines the length of corresponding VALUE.

pymysqlreplication/tests/benchmark.py

@@ -30,7 +30,8 @@ def consume_events():
     for binlogevent in stream:
         i += 1.0
         if i % 1000 == 0:
-            print("%d event by seconds (%d total)" % (i / (time.clock() - start), i))
+            print(f"{i / (time.clock()- start)} event by seconds ({i} total)")
+
     stream.close()
 
 

pymysqlreplication/tests/binlogfilereader.py

@@ -101,8 +101,7 @@ def __repr__(self):
         mod = cls.__module__
         name = cls.__name__
         only = [type(x).__name__ for x in self._only_events]
-        fmt = "<{mod}.{name}(file_path={fpath}, only_events={only})>"
-        return fmt.format(mod=mod, name=name, fpath=self._file_path, only=only)
+        return f"<{mod}.{name}(file_path={self._file_path}, only_events={only})>"
 
 
 # pylint: disable=too-many-instance-attributes
@@ -134,14 +133,7 @@ def __repr__(self):
         cls = self.__class__
         mod = cls.__module__
         name = cls.__name__
-        fmt = "<{mod}.{name}(timestamp={ts}, event_type={et}, log_pos={pos})>"
-        return fmt.format(
-            mod=mod,
-            name=name,
-            ts=int(self.timestamp),
-            et=self.event_type,
-            pos=self.log_pos,
-        )
+        return f"<{mod}.{name}(timestamp={int(self.timestamp)}, event_type={self.event_type}, log_pos={self.log_pos})>"
 
 
 class BadMagicBytesError(Exception):

pymysqlreplication/tests/test_basic.py

@@ -790,7 +790,7 @@ def test_drop_column(self):
             self.stream.fetchone()  # insert with two values
             self.stream.fetchone()  # insert with one value
         except Exception as e:
-            self.fail("raised unexpected exception: {exception}".format(exception=e))
+            self.fail(f"raised unexpected exception: {e}")
         finally:
             self.resetBinLog()
 
@@ -843,7 +843,7 @@ def test_separate_ctl_settings_no_error(self):
         try:
             self.stream.fetchone()
         except Exception as e:
-            self.fail("raised unexpected exception: {exception}".format(exception=e))
+            self.fail(f"raised unexpected exception: {e}")
         finally:
             self.resetBinLog()
 
@@ -1400,7 +1400,7 @@ def test_start_encryption_event(self):
                 first_line = key_file.readline()
                 key_version_from_key_file = int(first_line.split(";")[0])
         except Exception as e:
-            self.fail("raised unexpected exception: {exception}".format(exception=e))
+            self.fail(f"raised unexpected exception: {e}")
         finally:
             self.resetBinLog()
 

pyproject.toml

@@ -6,4 +6,4 @@ ignore = [
 ]
 
 [tool.ruff.per-file-ignores]
-"__init__.py" = ["F401"]
+"__init__.py" = ["F401"]

scripts/lint.sh

@@ -4,4 +4,4 @@ set -e
 set -x
 
 ruff pymysqlreplication
-black pymysqlreplication --check
+black pymysqlreplication --check

test.Dockerfile

@@ -29,4 +29,4 @@ ARG MARIADB_10_6
 ENV MARIADB_10_6 ${MARIADB_10_6}
 
 ARG MARIADB_10_6_PORT
-ENV MARIADB_10_6_PORT ${MARIADB_10_6_PORT}
+ENV MARIADB_10_6_PORT ${MARIADB_10_6_PORT}