Merge branch 'release-2.0.1'

Author: Geert Vanderkelen

CHANGES.txt

@@ -8,6 +8,24 @@ Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 Full release notes:
  http://dev.mysql.com/doc/relnotes/connector-python/en/
 
+v2.0.1
+======
+
+- WL7954: Add support for RANGE_STRING Fabric sharding type
+- WL7955: Add support for RANGE_DATETIME Fabric sharding type
+- BUG19440592: Fix exception not captured when SSL is unavailable
+- BUG19481761: Fix option files with !include with trailing newline
+- BUG18798953: Add MySQLConnection.shutdown() to abruply close connection
+- BUG19168737: Fix unsupported connection argument error with option files
+- BUG19282158: Fix NULL values to work with prepared statements
+- BUG19179711: Fix using '%s' in django backend
+- BUG19169143: Fix raising error with duplicate option files
+- BUG19170287: Fix duplicate section error with Python v3
+- BUG19163169: Add support for Django 1.7
+- BUG19225481: Fix floating point inaccuracy with Python v2
+- BUG19164627: Fix cursor trying  to decode linestring data as utf-8
+
+
 v2.0.0a1
 ========
 

cpyint

@@ -38,6 +38,7 @@
     TimestampFromTicks, TimeFromTicks,
     STRING, BINARY, NUMBER, DATETIME, ROWID,
     apilevel, threadsafety, paramstyle)
+from .optionfiles import read_option_files
 
 _CONNECTION_POOLS = {}
 
@@ -129,6 +130,10 @@ def connect(*args, **kwargs):
 
     Returns MySQLConnection or PooledMySQLConnection.
     """
+    # Option files
+    if 'option_files' in kwargs:
+        new_config = read_option_files(**kwargs)
+        return connect(**new_config)
 
     if all(['fabric' in kwargs, 'failover' in kwargs]):
         raise InterfaceError("fabric and failover arguments can not be used")

lib/mysql/connector/__init__.py

@@ -35,8 +35,10 @@
 
 if PY2:
     NUMERIC_TYPES = (int, float, Decimal, HexLiteral, long)
+    UNICODE_TYPES = (unicode,)  # This should not contain str
 else:
     NUMERIC_TYPES = (int, float, Decimal, HexLiteral)
+    UNICODE_TYPES = (str,)
 
 def init_bytearray(payload=b'', encoding='utf-8'):
     """Initializes a bytearray from the payload"""
@@ -65,6 +67,13 @@ def isstr(obj):
     else:
         return isinstance(obj, str)
 
+def isunicode(obj):
+    """Returns whether a variable is a of unicode type"""
+    if PY2:
+        return isinstance(obj, unicode)
+    else:
+        return isinstance(obj, str)
+
 
 if PY2:
     def struct_unpack(fmt, buf):

lib/mysql/connector/catch23.py

@@ -43,7 +43,6 @@
     MySQLCursorDict, MySQLCursorBufferedDict, MySQLCursorNamedTuple,
     MySQLCursorBufferedNamedTuple)
 from .network import MySQLUnixSocket, MySQLTCPSocket
-from .optionfiles import MySQLOptionsParser
 from .protocol import MySQLProtocol
 from .utils import int4store
 
@@ -239,59 +238,6 @@ def _auth_switch_request(self, username=None, password=None):
         elif packet[4] == 255:
             raise errors.get_exception(packet)
 
-    def _read_option_files(self, config):
-        """
-        Read option files for connection parameters.
-
-        Checks if connection arguments contain option file arguments, and then
-        reads option files accordingly.
-        """
-        if 'option_files' in config:
-            try:
-                if isinstance(config['option_groups'], str):
-                    config['option_groups'] = [config['option_groups']]
-                groups = config['option_groups']
-                del config['option_groups']
-            except KeyError:
-                groups = ['client', 'connector_python']
-
-            if isinstance(config['option_files'], str):
-                config['option_files'] = [config['option_files']]
-            option_parser = MySQLOptionsParser(list(config['option_files']),
-                                               keep_dashes=False)
-            del config['option_files']
-
-            config_from_file = option_parser.get_groups_as_dict_with_priority(
-                *groups)
-            config_options = {}
-            for group in groups:
-                try:
-                    for option, value in config_from_file[group].items():
-                        try:
-                            if option == 'socket':
-                                option = 'unix_socket'
-                            # pylint: disable=W0104
-                            DEFAULT_CONFIGURATION[option]
-                            # pylint: enable=W0104
-
-                            if (option not in config_options or
-                                    config_options[option][1] <= value[1]):
-                                config_options[option] = value
-                        except KeyError:
-                            if group is 'connector_python':
-                                raise AttributeError("Unsupported argument "
-                                                     "'{0}'".format(option))
-                except KeyError:
-                    continue
-
-            for option, value in config_options.items():
-                if option not in config:
-                    try:
-                        config[option] = eval(value[0])  # pylint: disable=W0123
-                    except (NameError, SyntaxError):
-                        config[option] = value[0]
-        return config
-
     def config(self, **kwargs):
         """Configure the MySQL Connection
 
@@ -303,9 +249,6 @@ def config(self, **kwargs):
         if 'dsn' in config:
             raise errors.NotSupportedError("Data source name is not supported")
 
-        # Read option files
-        self._read_option_files(config)
-
         # Configure how we handle MySQL warnings
         try:
             self.get_warnings = config['get_warnings']
@@ -509,6 +452,17 @@ def connect(self, **kwargs):
         self._open_connection()
         self._post_connection()
 
+    def shutdown(self):
+        """Shut down connection to MySQL Server.
+        """
+        if not self._socket:
+            return
+
+        try:
+            self._socket.shutdown()
+        except (AttributeError, errors.Error):
+            pass  # Getting an exception would mean we are disconnected.
+
     def disconnect(self):
         """Disconnect from the MySQL server
         """

lib/mysql/connector/connection.py

@@ -138,7 +138,10 @@ def quote(self, buf):
         """
         if isinstance(buf, NUMERIC_TYPES):
             if PY2:
-                return str(buf)
+                if isinstance(buf, float):
+                    return repr(buf)
+                else:
+                    return str(buf)
             else:
                 return str(buf).encode('ascii')
         elif isinstance(buf, type(None)):
@@ -337,7 +340,10 @@ def to_python(self, flddsc, value):
             return self._cache_field_types[flddsc[1]](value, flddsc)
         except KeyError:
             # If one type is not defined, we just return the value as str
-            return value.decode('utf-8')
+            try:
+                return value.decode('utf-8')
+            except UnicodeDecodeError:
+                return value
         except ValueError as err:
             raise ValueError("%s (field %s)" % (err, flddsc[0]))
         except TypeError as err:
@@ -379,7 +385,10 @@ def row_to_python(self, row, fields):
                 result[i] = self._cache_field_types[field_type](row[i], field)
             except KeyError:
                 # If one type is not defined, we just return the value as str
-                result[i] = row[i].decode('utf-8')
+                try:
+                    result[i] = row[i].decode('utf-8')
+                except UnicodeDecodeError:
+                    result[i] = row[i]
             except (ValueError, TypeError) as err:
                 err.message = "{0} (field {1})".format(str(err), field[0])
                 raise

lib/mysql/connector/conversion.py

@@ -469,6 +469,9 @@ def execute(self, operation, params=None, multi=False):
         """
         if not operation:
             return None
+
+        if not self._connection:
+            raise errors.ProgrammingError("Cursor is not connected.")
         if self._connection.unread_result is True:
             raise errors.InternalError("Unread result found.")
 

lib/mysql/connector/cursor.py

@@ -26,6 +26,7 @@
 
 import sys
 
+
 class HexLiteral(str):
 
     """Class holding MySQL hex literals"""