Remove Python2 compatibility (#480)

soulee-dev · web-flow · commit a4e59d6612b7 · 2023-09-23T09:46:21.000+02:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Python MySQL Replication documentation build configuration file, created by
 # sphinx-quickstart on Sun Sep 30 15:04:27 2012.
 #
diff --git a/examples/dump_events.py b/examples/dump_events.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 #
 # Dump all replication events from a remote mysql server
diff --git a/examples/logstash/mysql_to_logstash.py b/examples/logstash/mysql_to_logstash.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 #
 # Output logstash events to the console from MySQL replication stream
diff --git a/examples/redis_cache.py b/examples/redis_cache.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 #
 # Update a redis server cache when an evenement is trigger
diff --git a/pymysqlreplication/_compat.py b/pymysqlreplication/_compat.py
diff --git a/pymysqlreplication/binlogstream.py b/pymysqlreplication/binlogstream.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import struct
 import logging
 from distutils.version import LooseVersion
diff --git a/pymysqlreplication/bitmap.py b/pymysqlreplication/bitmap.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 bitCountInByte = [
     0,
     1,
diff --git a/pymysqlreplication/column.py b/pymysqlreplication/column.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import struct
 
 from .constants import FIELD_TYPE
diff --git a/pymysqlreplication/constants/BINLOG.py b/pymysqlreplication/constants/BINLOG.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 UNKNOWN_EVENT = 0x00
 START_EVENT_V3 = 0x01
 QUERY_EVENT = 0x02
diff --git a/pymysqlreplication/constants/FIELD_TYPE.py b/pymysqlreplication/constants/FIELD_TYPE.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Original code from PyMySQL
 # Copyright (c) 2010 PyMySQL contributors
 #
diff --git a/pymysqlreplication/constants/__init__.py b/pymysqlreplication/constants/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from .BINLOG import *
 from .FIELD_TYPE import *
 from .STATUS_VAR_KEY import *
diff --git a/pymysqlreplication/event.py b/pymysqlreplication/event.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import binascii
 import struct
 import datetime
diff --git a/pymysqlreplication/gtid.py b/pymysqlreplication/gtid.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import re
 import struct
 import binascii
diff --git a/pymysqlreplication/packet.py b/pymysqlreplication/packet.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import struct
 
 from pymysqlreplication import constants, event, row_event
diff --git a/pymysqlreplication/row_event.py b/pymysqlreplication/row_event.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import struct
 import decimal
 import datetime
diff --git a/pymysqlreplication/table.py b/pymysqlreplication/table.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 class Table(object):
     def __init__(
         self, table_id, schema, table, columns, primary_key=None, column_name_flag=False
diff --git a/pymysqlreplication/tests/__init__.py b/pymysqlreplication/tests/__init__.py
@@ -1,12 +1,7 @@
-# -*- coding: utf-8 -*-
-
 from pymysqlreplication.tests.test_basic import *
 from pymysqlreplication.tests.test_data_type import *
 from pymysqlreplication.tests.test_data_objects import *
+import unittest
 
 if __name__ == "__main__":
-    if sys.version_info < (2, 7):
-        import unittest2 as unittest
-    else:
-        import unittest
     unittest.main()
diff --git a/pymysqlreplication/tests/base.py b/pymysqlreplication/tests/base.py
@@ -1,15 +1,8 @@
-# -*- coding: utf-8 -*-
-
 import pymysql
 import copy
 from pymysqlreplication import BinLogStreamReader
 import os
-import sys
-
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 base = unittest.TestCase
 
diff --git a/pymysqlreplication/tests/benchmark.py b/pymysqlreplication/tests/benchmark.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # This is a sample script in order to make benchmark
 # on library speed.
 #
diff --git a/pymysqlreplication/tests/test_abnormal.py b/pymysqlreplication/tests/test_abnormal.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Test abnormal conditions, such as caused by a MySQL crash
 """
 import os.path
diff --git a/pymysqlreplication/tests/test_basic.py b/pymysqlreplication/tests/test_basic.py
@@ -1,16 +1,9 @@
-# -*- coding: utf-8 -*-
 import copy
 import io
 import os
-import sys
 import time
-
 import pymysql
-
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from pymysqlreplication.tests import base
 from pymysqlreplication import BinLogStreamReader
diff --git a/pymysqlreplication/tests/test_data_objects.py b/pymysqlreplication/tests/test_data_objects.py
@@ -1,10 +1,4 @@
-import sys
-
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
-
+import unittest
 from pymysqlreplication.column import Column
 from pymysqlreplication.table import Table
 from pymysqlreplication.event import GtidEvent
diff --git a/pymysqlreplication/tests/test_data_type.py b/pymysqlreplication/tests/test_data_type.py
@@ -1,32 +1,22 @@
-# -*- coding: utf-8 -*-
-
 import copy
 import platform
-import sys
 import json
-
 from pymysqlreplication import BinLogStreamReader
-
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from decimal import Decimal
 
 from pymysqlreplication.tests import base
 from pymysqlreplication.constants.BINLOG import *
 from pymysqlreplication.row_event import *
 from pymysqlreplication.event import *
-from pymysqlreplication._compat import text_type
-
 
 __all__ = ["TestDataType", "TestDataTypeVersion8"]
 
 
 def to_binary_dict(d):
     def encode_value(v):
-        if isinstance(v, text_type):
+        if isinstance(v, str):
             return v.encode()
         if isinstance(v, list):
             return [encode_value(x) for x in v]
diff --git a/setup.py b/setup.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 try:
     from setuptools import setup, Command

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-#`
`3`	`1`	`# Python MySQL Replication documentation build configuration file, created by`
`4`	`2`	`# sphinx-quickstart on Sun Sep 30 15:04:27 2012.`
`5`	`3`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/usr/bin/env python`
`2`		`-# -- coding: utf-8 --`
`3`	`2`
`4`	`3`	`#`
`5`	`4`	`# Dump all replication events from a remote mysql server`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`import struct`
`4`	`2`	`import logging`
`5`	`3`	`from distutils.version import LooseVersion`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`bitCountInByte = [`
`4`	`2`	`0,`
`5`	`3`	`1,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`UNKNOWN_EVENT = 0x00`
`4`	`2`	`START_EVENT_V3 = 0x01`
`5`	`3`	`QUERY_EVENT = 0x02`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`# Original code from PyMySQL`
`4`	`2`	`# Copyright (c) 2010 PyMySQL contributors`
`5`	`3`	`#`