WL12239: Add support for Python 3.7

nmariz · nmariz · commit d0ca7a74e67f · 2018-09-12T10:07:24.000+01:00
diff --git a/cpyint b/cpyint
@@ -1 +1 @@
-Subproject commit be167cf5919ff213ca8b2a4e25516de515b2bc37
+Subproject commit 37113e6ec33a2ee980436a931e33ceff2c6cfa0f
diff --git a/lib/mysql/connector/cursor.py b/lib/mysql/connector/cursor.py
@@ -498,16 +498,19 @@ def _execute_iter(self, query_iter):
 
         i = 0
         while True:
-            result = next(query_iter)  # pylint: disable=R1708
-            self._reset_result()
-            self._handle_result(result)
             try:
-                self._executed = executed_list[i].strip()
-                i += 1
-            except IndexError:
-                self._executed = executed_list[0]
-
-            yield self
+                result = next(query_iter)
+                self._reset_result()
+                self._handle_result(result)
+                try:
+                    self._executed = executed_list[i].strip()
+                    i += 1
+                except IndexError:
+                    self._executed = executed_list[0]
+
+                yield self
+            except StopIteration:
+                return
 
     def execute(self, operation, params=None, multi=False):
         """Executes the given operation
diff --git a/lib/mysql/connector/cursor_cext.py b/lib/mysql/connector/cursor_cext.py
@@ -205,11 +205,13 @@ def _execute_iter(self):
         while True:
             try:
                 if not self.nextset():
-                    raise StopIteration  # pylint: disable=R1708
+                    raise StopIteration
             except errors.InterfaceError as exc:
                 # Result without result set
                 if exc.errno != CR_NO_RESULT_SET:
                     raise
+            except StopIteration:
+                return
             i += 1
             try:
                 self._executed = executed_list[i].strip()
diff --git a/lib/mysqlx/constants.py b/lib/mysqlx/constants.py
@@ -43,7 +43,7 @@ def create_enum(name, fields, values=None):
     Returns:
         namedtuple: A namedtuple object.
     """
-    Enum = namedtuple(name, fields, verbose=False)
+    Enum = namedtuple(name, fields)
     if values is None:
         return Enum(*fields)
     return Enum(*values)
diff --git a/setupinfo.py b/setupinfo.py
@@ -130,6 +130,7 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
     'Topic :: Database',
     'Topic :: Software Development',
     'Topic :: Software Development :: Libraries :: Application Frameworks',
diff --git a/src/mysqlxpb/mysqlxpb.cc b/src/mysqlxpb/mysqlxpb.cc
@@ -1,5 +1,5 @@
 ﻿/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -667,7 +667,7 @@ static google::protobuf::Message* CreateMessage(PyObject* dict,
     PyObject* type_name_obj = PyDict_GetItemString(dict, kMessageTypeKey);
 
     if (type_name_obj && PyString_CheckExact(type_name_obj)) {
-      char* type_name = PyString_AsString(type_name_obj);
+      const char* type_name = PyString_AsString(type_name_obj);
       const google::protobuf::Descriptor* descriptor =
           MessageDescriptorByName(type_name);
 
@@ -682,7 +682,7 @@ static google::protobuf::Message* CreateMessage(PyObject* dict,
 
             while (PyDict_Next(dict, &pos, &key, &value)) {
               if (key && PyString_CheckExact(key)) {
-                char* key_name = PyString_AsString(key);
+                const char* key_name = PyString_AsString(key);
 
                 if (::strcmp(key_name, kMessageTypeKey) == 0)
                   continue;
diff --git a/src/mysqlxpb/python_cast.h b/src/mysqlxpb/python_cast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -128,7 +128,7 @@ std::string python_cast<std::string>(PyObject* obj) {
 #ifdef PY3
   else if (PyUnicode_CheckExact(obj)) {
     Py_ssize_t len;
-    char* str = PyUnicode_AsUTF8AndSize(obj, &len);
+    const char* str = PyUnicode_AsUTF8AndSize(obj, &len);
     return std::string(str, len);
   } else if (PyBytes_CheckExact(obj)) {
     return std::string(PyBytes_AsString(obj), PyBytes_Size(obj));
diff --git a/tests/mysqld.py b/tests/mysqld.py
@@ -242,7 +242,9 @@ def _init_mysql_install(self):
                    afile == 'innodb_memcached_config.sql':
                     self._scriptdir = root
 
-        if not self._lc_messages_dir or not self._scriptdir:
+        version = self._get_version()
+        if not self._lc_messages_dir or (version < (8, 0, 13) and
+                                         not self._scriptdir):
             raise MySQLBootstrapError(
                 "errmsg.sys and mysql_system_tables.sql not found"
                 " under {0}".format(self._sharedir))
@@ -549,7 +551,7 @@ def bootstrap(self):
                 test_sql = open(self._init_sql, "w")
                 test_sql.write("\n".join(extra_sql))
                 test_sql.close()
-            else:
+            elif self._version < (8, 0, 13):
                 for filename in script_files:
                     full_path = os.path.join(self._scriptdir, filename)
                     LOGGER.debug("Reading SQL from '%s'", full_path)
diff --git a/tests/test_setup.py b/tests/test_setup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2018, 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
@@ -138,7 +138,7 @@ def test_classifiers(self):
             if 'Programming Language :: Python' in clsfr:
                 ver = clsfr.replace('Programming Language :: Python :: ', '')
                 if ver not in ('2.6', '2.7', '3', '3.1', '3.2', '3.3', '3.4',
-                               '3.5', '3.6'):
+                               '3.5', '3.6', '3.7'):
                     self.fail('Unsupported version in classifiers')
             if 'Development Status ::' in clsfr:
                 status = clsfr.replace('Development Status :: ', '')
