Merge branch 'BUG20022580' into release-2.1.1

Author: peeyushgupta

lib/mysql/connector/catch23.py

@@ -36,13 +36,13 @@
 if PY2:
     NUMERIC_TYPES = (int, float, Decimal, HexLiteral, long)
     INT_TYPES = (int, long)
-    UNICODE_TYPE = (unicode,)
+    UNICODE_TYPES = (unicode,)
     STRING_TYPES = (str, unicode)
     BYTE_TYPES = (bytearray,)
 else:
     NUMERIC_TYPES = (int, float, Decimal, HexLiteral)
     INT_TYPES = (int,)
-    UNICODE_TYPE = (str,)
+    UNICODE_TYPES = (str,)
     STRING_TYPES = (str,)
     BYTE_TYPES = (bytearray, bytes)
 

lib/mysql/connector/fabric/connection.py

@@ -76,7 +76,7 @@
 from .caching import FabricCache
 from .balancing import WeightedRoundRobin
 from .. import version
-from ..catch23 import PY2, isunicode, UNICODE_TYPE
+from ..catch23 import PY2, isunicode, UNICODE_TYPES
 
 RESET_CACHE_ON_ERROR = (
     errorcode.CR_SERVER_LOST,
@@ -123,7 +123,7 @@
     # name: ((valid_types), description, default)
     'group': ((str,), "Name of group of servers", None),
     'key': (tuple([int, str, datetime.datetime,
-                   datetime.date] + list(UNICODE_TYPE)),
+                   datetime.date] + list(UNICODE_TYPES)),
             "Sharding key", None),
     'tables': ((tuple, list), "List of tables in query", None),
     'mode': ((int,), "Read-Only, Write-Only or Read-Write", MODE_READWRITE),