Updated to support newest PyMySQL

Author: terricain

aiomysql/connection.py

@@ -26,9 +26,8 @@
                          ProgrammingError)
 
 from pymysql.connections import TEXT_TYPES, MAX_PACKET_LEN, DEFAULT_CHARSET
-# from pymysql.connections import dump_packet
-from pymysql.connections import _scramble
-from pymysql.connections import _scramble_323
+from pymysql.connections import _auth
+
 from pymysql.connections import pack_int24
 
 from pymysql.connections import MysqlPacket
@@ -687,7 +686,7 @@ async def _request_authentication(self):
             auth_plugin = self._server_auth_plugin
 
         if auth_plugin in ('', 'mysql_native_password'):
-            authresp = _scramble(self._password.encode('latin1'), self.salt)
+            authresp = _auth.scramble_native_password(self._password, self.salt)
         elif auth_plugin in ('', 'mysql_clear_password'):
             authresp = self._password.encode('latin1') + b'\0'
 
@@ -731,8 +730,7 @@ async def _request_authentication(self):
                     plugin_name, auth_packet)
             else:
                 # send legacy handshake
-                data = _scramble_323(self._password.encode('latin1'),
-                                     self.salt) + b'\0'
+                data = _auth.scramble_old_password(self._password, auth_packet.read_all()) + b'\0'
                 self.write_packet(data)
                 auth_packet = await self._read_packet()
 
@@ -741,13 +739,11 @@ async def _process_auth(self, plugin_name, auth_packet):
             # https://dev.mysql.com/doc/internals/en/
             # secure-password-authentication.html#packet-Authentication::
             # Native41
-            data = _scramble(self._password.encode('latin1'),
-                             auth_packet.read_all())
+            data = _auth.scramble_native_password(self._password, auth_packet.read_all())
         elif plugin_name == b"mysql_old_password":
             # https://dev.mysql.com/doc/internals/en/
             # old-password-authentication.html
-            data = _scramble_323(self._password.encode('latin1'),
-                                 auth_packet.read_all()) + b'\0'
+            data = _auth.scramble_old_password(self._password, auth_packet.read_all()) + b'\0'
         elif plugin_name == b"mysql_clear_password":
             # https://dev.mysql.com/doc/internals/en/
             # clear-text-authentication.html

requirements-dev.txt

@@ -5,7 +5,7 @@ ipython==6.4.0
 pytest==3.6.1
 pytest-cov==2.5.1
 pytest-sugar==0.9.1
-PyMySQL>=0.7.5,<0.9
+PyMySQL>=0.9,<=0.9.2
 docker==3.3.0
 sphinx==1.7.5
 sphinxcontrib-asyncio==0.2.0