Merge branch 'release/8.0.24'

Author: nmariz

.gitignore

@@ -1,5 +1,6 @@
 *.diff
 *.egg-info/
+*.so
 *.patch
 *.pyc
 *__pycache__*

CHANGES.txt

@@ -15,6 +15,7 @@ v8.0.24
 - WL#14239: Remove Python 2.7 support
 - WL#14212: Support connection close notification
 - WL#14027: Add support for Python 3.9
+- BUG#32029891: Add context manager support for pooled connections
 
 v8.0.23
 =======

cpydist/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -155,16 +155,38 @@ def finalize_options(self):
             log.set_threshold(1)  # Set Distutils logging level to DEBUG
 
         cmd_build_ext = self.distribution.get_command_obj("build_ext")
-        cmd_build_ext.with_mysql_capi = self.with_mysql_capi
-        cmd_build_ext.with_openssl_include_dir = self.with_openssl_include_dir
-        cmd_build_ext.with_openssl_lib_dir = self.with_openssl_lib_dir
-        cmd_build_ext.with_protobuf_include_dir = \
-            self.with_protobuf_include_dir
-        cmd_build_ext.with_protobuf_lib_dir = self.with_protobuf_lib_dir
-        cmd_build_ext.with_protoc = self.with_protoc
-        cmd_build_ext.extra_compile_args = self.extra_compile_args
-        cmd_build_ext.extra_link_args = self.extra_link_args
-
+        cmd_build_ext.with_mysql_capi = (
+            self.with_mysql_capi or
+            os.environ.get("MYSQL_CAPI")
+        )
+        cmd_build_ext.with_openssl_include_dir = (
+            self.with_openssl_include_dir or
+            os.environ.get("OPENSSL_INCLUDE_DIR")
+        )
+        cmd_build_ext.with_openssl_lib_dir = (
+            self.with_openssl_lib_dir or
+            os.environ.get("OPENSSL_LIB_DIR")
+        )
+        cmd_build_ext.with_protobuf_include_dir = (
+            self.with_protobuf_include_dir or
+            os.environ.get("PROTOBUF_INCLUDE_DIR")
+        )
+        cmd_build_ext.with_protobuf_lib_dir = (
+            self.with_protobuf_lib_dir or
+            os.environ.get("PROTOBUF_LIB_DIR")
+        )
+        cmd_build_ext.with_protoc = (
+            self.with_protoc or
+            os.environ.get("PROTOC")
+        )
+        cmd_build_ext.extra_compile_args = (
+            self.extra_compile_args or
+            os.environ.get("EXTRA_COMPILE_ARGS")
+        )
+        cmd_build_ext.extra_link_args = (
+            self.extra_link_args or
+            os.environ.get("EXTRA_LINK_ARGS")
+        )
         self._copy_vendor_libraries()
 
     def remove_temp(self):

cpydist/bdist_deb.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -255,10 +255,13 @@ def _populate_debian(self):
                           "".format(copyright_file))
             with open(copyright_file, "r") as fp:
                 # Skip to line just before the text we want to copy
-                while not fp.readline().startswith("License: Commercial"):
-                    continue
-                # Read the rest of the text (add a space before each line)
-                lic_text = fp.read()
+                while True:
+                    line = fp.readline()
+                    if not line:
+                        break
+                    if line.startswith("License: Commercial"):
+                        # Read the rest of the text
+                        lic_text = fp.read()
 
         with open(control_file, "r") as fp:
             control_text = fp.read()

cpydist/data/deb/control

@@ -3,10 +3,10 @@ Priority: extra
 Section: python
 Maintainer: MySQL Release Engineering <[email protected]>
 Build-Depends:
- debhelper (>= 9.0.0), dh-python, python (>= 3.5.0) | python3 (>= 3.5.0)
+ debhelper (>= 9.0.0), dh-python, python (>= 3.6.0) | python3 (>= 3.6.0)
 Standards-Version: 3.9.8
 Homepage: http://dev.mysql.com/downloads/connector/python/
-X-Python3-Version: >= 3.5
+X-Python3-Version: >= 3.6
 
 Package: mysql-connector-python-py3
 Architecture: any

cpydist/data/deb/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -30,6 +30,8 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 export DH_VERBOSE = 1
+export PYBUILD_DISABLE=test
+export PYBUILD_DISABLE_python2=1
 
 PY3_BUILD_LIB_OPT = --build-lib=build/python3
 
@@ -69,20 +71,17 @@ endif
 
 # Check whether we have Python v3 support
 ifneq ($(shell which py3versions 2>/dev/null),)
-  WITHPYTHON="python3"
-  PYTHON3_SUPPORTED=$(shell py3versions -sv)
+    PYTHON3_SUPPORTED=$(shell py3versions -sv)
 endif
 
 ifneq ($(BYTE_CODE_ONLY),)
     BYTE_CODE_ONLY_OPT = --byte-code-only
-    EXTRA_OPTIONS_DH =
 else
     BYTE_CODE_ONLY_OPT =
-    EXTRA_OPTIONS_DH = --buildsystem=python_distutils --with $(WITHPYTHON)
 endif
 
 %:
-	dh $@ $(EXTRA_OPTIONS_DH)
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_install:
 
@@ -103,7 +102,9 @@ override_dh_auto_install:
 	done
 
 override_dh_python3:
-	dh_python3 --no-ext-rename
+ifeq ($(BYTE_CODE_ONLY),)
+	py3clean .
+endif
 
 ifneq ($(BYTE_CODE_ONLY),)
 override_dh_pysupport:

cpydist/data/rpm/mysql-connector-python.spec

@@ -75,7 +75,7 @@ Summary:       Standardized MySQL database driver for Python
 Name:          mysql-connector-python%{?product_suffix}
 Version:       %{version}
 Release:       1%{?version_extra:.%{version_extra}}%{?byte_code_only:.1}%{?dist}
-License:       Copyright (c) 2015, 2020, Oracle and/or its affiliates. Under %{?license_type} license as shown in the Description field.
+License:       Copyright (c) 2015, 2021, Oracle and/or its affiliates. Under %{?license_type} license as shown in the Description field.
 URL:           https://dev.mysql.com/downloads/connector/python/
 Source0:       https://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python%{?product_suffix}-%{version}.tar.gz
 

lib/mysql/connector/pooling.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -111,6 +111,12 @@ def __init__(self, pool, cnx):
         self._cnx_pool = pool
         self._cnx = cnx
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.close()
+
     def __getattr__(self, attr):
         """Calls attributes of the MySQLConnection instance"""
         return getattr(self._cnx, attr)

tests/test_pooling.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -333,6 +333,10 @@ def test_get_connection(self):
         self.assertEqual(1, pcnx.autocommit)
         pcnx.close()
 
+        # Get connection from pool using a context manager
+        with cnxpool.get_connection() as pcnx:
+            self.assertTrue(isinstance(pcnx, pooling.PooledMySQLConnection))
+
     def test__remove_connections(self):
         dbconfig = tests.get_mysql_config()
         if tests.MYSQL_VERSION < (5, 7):