[compat] Remove py27 support as Python 2.7 will be deprecated beginning of 2020

Author: Bastien Vallet

INSTALL.rst

@@ -8,7 +8,7 @@ MySQLdb Installation
 Prerequisites
 -------------
 
-+ Python 2.7, 3.5 or higher
++ Python 3.5 or higher
 
 + setuptools
 

MySQLdb/__init__.py

@@ -26,7 +26,6 @@
 paramstyle = "format"
 
 from ._mysql import *
-from MySQLdb.compat import PY2
 from MySQLdb.constants import FIELD_TYPE
 from MySQLdb.times import Date, Time, Timestamp, \
     DateFromTicks, TimeFromTicks, TimestampFromTicks
@@ -71,12 +70,8 @@ def test_DBAPISet_set_equality_membership():
 def test_DBAPISet_set_inequality_membership():
     assert FIELD_TYPE.DATE != STRING
 
-if PY2:
-    def Binary(x):
-        return bytearray(x)
-else:
-    def Binary(x):
-        return bytes(x)
+def Binary(x):
+    return bytes(x)
 
 def Connect(*args, **kwargs):
     """Factory function for connections.Connection."""

MySQLdb/_exceptions.py

@@ -4,10 +4,8 @@
 
     https://www.python.org/dev/peps/pep-0249/
 """
-from .compat import StandardError
 
-
-class MySQLError(StandardError):
+class MySQLError(Exception):
     """Exception related to operation with MySQL."""
 
 

MySQLdb/compat.py

@@ -8,7 +8,6 @@
 import sys
 
 from MySQLdb import cursors, _mysql
-from MySQLdb.compat import unicode, PY2
 from MySQLdb._exceptions import (
     Warning, Error, InterfaceError, DataError,
     DatabaseError, OperationalError, IntegrityError, InternalError,
@@ -147,7 +146,7 @@ class object, used to create cursors (keyword only)
         cursorclass = kwargs2.pop('cursorclass', self.default_cursor)
         charset = kwargs2.get('charset', '')
 
-        if charset or not PY2:
+        if charset:
             use_unicode = True
         else:
             use_unicode = False
@@ -253,10 +252,7 @@ def literal(self, o):
         elif isinstance(o, bytearray):
             s = self._bytes_literal(o)
         elif isinstance(o, bytes):
-            if PY2:
-                s = self.string_literal(o)
-            else:
-                s = self._bytes_literal(o)
+            s = self._bytes_literal(o)
         elif isinstance(o, (tuple, list)):
             s = self._tuple_literal(o)
         else:

MySQLdb/connections.py

@@ -35,7 +35,6 @@
 from MySQLdb._mysql import string_literal, escape
 from MySQLdb.constants import FIELD_TYPE, FLAG
 from MySQLdb.times import *
-from MySQLdb.compat import PY2, long, unicode
 from MySQLdb._exceptions import ProgrammingError
 
 NoneType = type(None)

MySQLdb/converters.py

@@ -8,7 +8,6 @@
 import re
 import sys
 
-from .compat import unicode
 from ._exceptions import (
     Warning, Error, InterfaceError, DataError,
     DatabaseError, OperationalError, IntegrityError, InternalError,

MySQLdb/cursors.py

@@ -19,8 +19,6 @@ classifiers:
         Operating System :: Unix
         Programming Language :: C
         Programming Language :: Python
-        Programming Language :: Python :: 2
-        Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
         Programming Language :: Python :: 3.5
         Programming Language :: Python :: 3.6
@@ -30,7 +28,6 @@ classifiers:
         Topic :: Database :: Database Engines/Servers
 py_modules:
         MySQLdb._exceptions
-        MySQLdb.compat
         MySQLdb.connections
         MySQLdb.converters
         MySQLdb.cursors

metadata.cfg

@@ -10,8 +10,6 @@
 import unittest
 from configdb import connection_factory
 
-from MySQLdb.compat import unichr
-
 
 class DatabaseTest(unittest.TestCase):
 
@@ -27,8 +25,8 @@ def setUp(self):
         db = connection_factory(**self.connect_kwargs)
         self.connection = db
         self.cursor = db.cursor()
-        self.BLOBUText = u''.join([unichr(i) for i in range(16384)])
-        self.BLOBBinary = self.db_module.Binary((u''.join([unichr(i) for i in range(256)] * 16)).encode('latin1'))
+        self.BLOBUText = u''.join([chr(i) for i in range(16384)])
+        self.BLOBBinary = self.db_module.Binary((u''.join([chr(i) for i in range(256)] * 16)).encode('latin1'))
 
     leak_test = True
 

tests/capabilities.py

@@ -5,7 +5,6 @@
 from contextlib import closing
 import unittest
 import MySQLdb
-from MySQLdb.compat import unicode
 from MySQLdb import cursors
 from configdb import connection_factory
 import warnings

tests/test_MySQLdb_capabilities.py

@@ -92,7 +92,7 @@ def test_client_flag(self):
 
         self.assertIsInstance(conn.client_flag, (int, MySQLdb.compat.long))
         self.assertTrue(conn.client_flag & MySQLdb.constants.CLIENT.FOUND_ROWS)
-        with self.assertRaises(TypeError if MySQLdb.compat.PY2 else AttributeError):
+        with self.assertRaises(AttributeError):
             conn.client_flag = 0
 
         conn.close()