Merge branch 'master' into feature/add_ssl_mode

Author: migimigi

.travis.yml

@@ -4,12 +4,11 @@ language: python
 # See aws s3 ls s3://travis-python-archives/binaries/ubuntu/16.04/x86_64/
 python:
   - "nightly"
-  - "pypy3.5"
-  - "pypy2.7-5.10.0"
+  - "pypy3"
+  - "3.8"
   - "3.7"
   - "3.6"
   - "3.5"
-  - "2.7"
 
 cache: pip
 
@@ -38,14 +37,17 @@ after_success:
 
 matrix:
   include:
-    - &django_py27
-      python: "2.7"
+    - &django_2_2
+      name: "Django 2.2 test"
+      env:
+        - DJANGO_VERSION=2.2.7
+      python: "3.5"
       install:
         - pip install -U pip
-        - wget https://github.com/django/django/archive/1.11.18.tar.gz
-        - tar xf 1.11.18.tar.gz
-        - pip install django-1.11.18/
-        - cp ci/test_mysql.py django-1.11.18/tests/
+        - wget https://github.com/django/django/archive/${DJANGO_VERSION}.tar.gz
+        - tar xf ${DJANGO_VERSION}.tar.gz
+        - pip install -e django-${DJANGO_VERSION}/
+        - cp ci/test_mysql.py django-${DJANGO_VERSION}/tests/
         - pip install .
 
       before_script:
@@ -54,11 +56,12 @@ matrix:
         - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql mysql
 
       script:
-        - cd django-1.11.18/tests/
+        - cd django-${DJANGO_VERSION}/tests/
         - ./runtests.py --parallel=1 --settings=test_mysql
 
-    - &django_py3
-      <<: *django_py27
-      python: "3.7"
+    #- &django_3_0
+    #  <<: *django_2_2
+    #  name: "Django 3.0 test (Python 3.8)"
+    #  python: "3.8"
 
 # vim: sw=2 ts=2 sts=2

HISTORY.rst

@@ -1,3 +1,46 @@
+======================
+ What's new in 1.4.6
+======================
+
+Release: 2019-11-21
+
+* The ``cp1252`` encoding is used when charset is "latin1". (#390)
+
+======================
+ What's new in 1.4.5
+======================
+
+Release: 2019-11-06
+
+* The ``auth_plugin`` option is added. (#389)
+
+
+======================
+ What's new in 1.4.4
+======================
+
+Release: 2019-08-12
+
+* ``charset`` option is passed to ``mysql_options(mysql, MYSQL_SET_CHARSET_NAME, charset)``
+  before ``mysql_real_connect`` is called.
+  This avoid extra ``SET NAMES <charset>`` query when creating connection.
+
+
+======================
+ What's new in 1.4.3
+======================
+
+Release: 2019-08-09
+
+* ``--static`` build supports ``libmariadbclient.a``
+* Try ``mariadb_config`` when ``mysql_config`` is not found
+* Fixed warning happend in Python 3.8 (#359)
+* Fixed ``from MySQLdb import *``, while I don't recommend it. (#369)
+* Fixed SEGV ``MySQLdb.escape_string("1")`` when libmariadb is used and
+  no connection is created. (#367)
+* Fixed many circular references are created in ``Cursor.executemany()``. (#375)
+
+
 ======================
  What's new in 1.4.2
 ======================

INSTALL.rst

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

Makefile

@@ -2,6 +2,11 @@
 build:
 	python3 setup.py build_ext -if
 
+.PHONY: doc
+doc:
+	pip install .
+	pip install sphinx
+	cd doc && make html
 
 .PHONY: clean
 clean:

MySQLdb/__init__.py

@@ -18,15 +18,14 @@
 from . import _mysql
 
 if version_info != _mysql.version_info:
-    raise ImportError("this is MySQLdb version %s, but _mysql is version %r" %
-                      (version_info, _mysql.version_info))
+    raise ImportError("this is MySQLdb version %s, but _mysql is version %r\n_mysql: %r" %
+                      (version_info, _mysql.version_info, _mysql.__file__))
 
 threadsafety = 1
 apilevel = "2.0"
 paramstyle = "format"
 
 from ._mysql import *
-from MySQLdb.compat import PY2
 from MySQLdb.constants import FIELD_TYPE, SSL_MODE
 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."""
@@ -89,7 +84,7 @@ def Connect(*args, **kwargs):
     'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks',
     'TimestampFromTicks', 'DataError', 'DatabaseError', 'Error',
     'FIELD_TYPE', 'IntegrityError', 'InterfaceError', 'InternalError',
-    'MySQLError', 'NULL', 'NUMBER', 'NotSupportedError', 'DBAPISet',
+    'MySQLError', 'NUMBER', 'NotSupportedError', 'DBAPISet',
     'OperationalError', 'ProgrammingError', 'ROWID', 'STRING', 'TIME',
     'TIMESTAMP', 'Warning', 'apilevel', 'connect', 'connections',
     'constants', 'converters', 'cursors', 'debug', 'escape',

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."""