merge devel

PyMySQL · methane · Jun 26, 2018 · Jun 22, 2017 · Jun 8, 2018 · Jun 8, 2018
commit c3931155fdd3a94b0e3fb02bda93f4ef7e4104c8
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -264,7 +264,8 @@ def __init__(self, host=None, user=None, password="",
                  autocommit=False, db=None, passwd=None, local_infile=False,
                  max_allowed_packet=16*1024*1024, defer_connect=False,
                  auth_plugin_map=None, read_timeout=None, write_timeout=None,
-                 bind_address=None, binary_prefix=False, server_public_key=None):
+                 bind_address=None, binary_prefix=False, program_name=None,
+                 server_public_key=None):
         if no_delay is not None:
             warnings.warn("no_delay option is deprecated", DeprecationWarning)
 
@@ -384,11 +385,23 @@ def _config(key, arg):
         self.max_allowed_packet = max_allowed_packet
         self._auth_plugin_map = auth_plugin_map or {}
         self._binary_prefix = binary_prefix
+
         if "caching_sha2_password" not in self._auth_plugin_map:
             self._auth_plugin_map["caching_sha2_password"] = _auth.CachingSHA2Password
         if "sha256_password" not in self._auth_plugin_map:
             self._auth_plugin_map["sha256_password"] = _auth.SHA256Password
         self.server_public_key = server_public_key
+
+        self._connect_attrs = {
+            '_client_name': 'pymysql',
+            '_pid': str(os.getpid()),
+            '_client_version': VERSION_STRING,
+        }
+        if program_name:
+            self._connect_attrs["program_name"] = program_name
+        elif sys.argv:
+            self._connect_attrs["program_name"] = sys.argv[0]
+
         if defer_connect:
             self._sock = None
         else:
@@ -904,7 +917,15 @@ def _request_authentication(self):
         if self.server_capabilities & CLIENT.PLUGIN_AUTH:
             data += plugin_name + b'\0'
 
-        print("authresp", authresp)
+        if self.server_capabilities & CLIENT.CONNECT_ATTRS:
+            connect_attrs = b''
+            for k, v in self._connect_attrs.items():
+                k = k.encode('utf8')
+                connect_attrs += struct.pack('B', len(k)) + k
+                v = v.encode('utf8')
+                connect_attrs += struct.pack('B', len(v)) + v
+            data += struct.pack('B', len(connect_attrs)) + connect_attrs
+
         self.write_packet(data)
         auth_packet = self._read_packet()