resec
diff --git a/‎lib/mysql/connector/authentication.py
Lines changed: 8 additions & 2 deletions b/‎lib/mysql/connector/authentication.py
Lines changed: 8 additions & 2 deletions
diff --git a/‎lib/mysql/connector/connection.py
Lines changed: 65 additions & 8 deletions b/‎lib/mysql/connector/connection.py
Lines changed: 65 additions & 8 deletions
@@ -139,7 +139,10 @@ def prepare_password(self):
             return b'\x00'
         password = self._password
 
-        if isinstance(self._password, str):
+        if PY2:
+            if isinstance(password, unicode):  # pylint: disable=E0602
+                password = password.encode('utf8')
+        elif isinstance(password, str):
             password = password.encode('utf8')
 
         return password + b'\x00'
@@ -161,7 +164,10 @@ def prepare_password(self):
             return b'\x00'
         password = self._password
 
-        if isinstance(self._password, str):
+        if PY2:
+            if isinstance(password, unicode):  # pylint: disable=E0602
+                password = password.encode('utf8')
+        elif isinstance(password, str):
             password = password.encode('utf8')
 
         return password + b'\x00'
 
@@ -24,27 +24,28 @@
 """Implementing communication with MySQL servers.
 """
 
+from io import IOBase
 import os
-import time
 import re
-from io import IOBase
+import time
 
-from .network import MySQLUnixSocket, MySQLTCPSocket
+from . import errors
+from .authentication import get_auth_plugin
+from .catch23 import PY2, isstr
 from .constants import (
     ClientFlag, ServerCmd, CharacterSet, ServerFlag,
     flag_is_set, ShutdownType, NET_BUFFER_LENGTH
 )
 from .conversion import MySQLConverterBase, MySQLConverter
-from .protocol import MySQLProtocol
-from . import errors
-from .utils import int4store
 from .cursor import (
     CursorBase, MySQLCursor, MySQLCursorRaw,
     MySQLCursorBuffered, MySQLCursorBufferedRaw, MySQLCursorPrepared,
     MySQLCursorDict, MySQLCursorBufferedDict, MySQLCursorNamedTuple,
     MySQLCursorBufferedNamedTuple)
-from .authentication import get_auth_plugin
-from .catch23 import PY2, isstr
+from .network import MySQLUnixSocket, MySQLTCPSocket
+from .optionfiles import MySQLOptionsParser
+from .protocol import MySQLProtocol
+from .utils import int4store
 
 DEFAULT_CONFIGURATION = {
     'database': None,
@@ -233,6 +234,59 @@ 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
 
@@ -244,6 +298,9 @@ 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']