Merge pull request #407 from julien-duponchelle/bytetoint

Fix usage of deprecated byte2int

Author: julien-duponchelle

.github/workflows/release.yml

@@ -28,4 +28,4 @@ jobs:
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        password: ${{ secrets.PYPI_API_TOKEN }}

pymysqlreplication/event.py

@@ -62,7 +62,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
         self.commit_flag = struct.unpack("!B", self.packet.read(1))[0] == 1
         self.sid = self.packet.read(16)
         self.gno = struct.unpack('<Q', self.packet.read(8))[0]
-        self.lt_type = byte2int(self.packet.read(1))
+        self.lt_type = self.packet.read(1)[0]
 
         if self.mysql_version >= (5, 7):
             self.last_committed = struct.unpack('<Q', self.packet.read(8))[0]

pymysqlreplication/tests/test_basic.py

@@ -25,9 +25,9 @@ def ignoredEvents(self):
         return [GtidEvent]
 
     def test_allowed_event_list(self):
-        self.assertEqual(len(self.stream._allowed_event_list(None, None, False)), 15)
-        self.assertEqual(len(self.stream._allowed_event_list(None, None, True)), 14)
-        self.assertEqual(len(self.stream._allowed_event_list(None, [RotateEvent], False)), 14)
+        self.assertEqual(len(self.stream._allowed_event_list(None, None, False)), 16)
+        self.assertEqual(len(self.stream._allowed_event_list(None, None, True)), 15)
+        self.assertEqual(len(self.stream._allowed_event_list(None, [RotateEvent], False)), 15)
         self.assertEqual(len(self.stream._allowed_event_list([RotateEvent], None, False)), 1)
 
     def test_read_query_event(self):
@@ -693,11 +693,11 @@ def test_ignore_decode_errors(self):
             ignore_decode_errors=False
         )
         event = self.stream.fetchone()
-        event = self.stream.fetchone()   
+        event = self.stream.fetchone()
         with self.assertRaises(UnicodeError) as exception:
             event = self.stream.fetchone()
             data = event.rows[0]["values"]["data"]
-        
+
         # Initialize with ignore_decode_errors=True
         self.stream = BinLogStreamReader(
             self.database,
@@ -706,11 +706,11 @@ def test_ignore_decode_errors(self):
             ignore_decode_errors=True
         )
         self.stream.fetchone()
-        self.stream.fetchone()        
+        self.stream.fetchone()
         event = self.stream.fetchone()
         data = event.rows[0]["values"]["data"]
         self.assertEqual(data, '[{"text":"  Some string"}]')
-    
+
     def test_drop_column(self):
         self.stream.close()
         self.execute("CREATE TABLE test_drop_column (id INTEGER(11), data VARCHAR(50))")