Merge branch 'master' into fix/opened_conns_on_connect_error

Author: methane

.travis.databases.json

@@ -1,4 +1,4 @@
 [
-    {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql",  "use_unicode": true, "local_infile": true},
+    {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql",  "use_unicode": true},
     {"host": "localhost", "user": "root", "passwd": "", "db": "test_pymysql2" }
 ]

.travis.yml

@@ -1,19 +1,21 @@
 sudo: false
 language: python
-python: "3.4"
+python:
+  - "3.6"
+  - "3.5"
+  - "3.4"
+  - "2.7"
+  - "pypy"
+
 env:
-    - TOX_ENV=py27
-    - TOX_ENV=py33
-    - TOX_ENV=py34
-    - TOX_ENV=pypy
-    - TOX_ENV=pypy3
+  - PYTHONIOENCODING=utf-8
 
 install:
-    - pip install -U tox
+    - pip install -U tornado
 
 before_script:
     - "mysql -e 'create database test_pymysql  DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
     - "mysql -e 'create database test_pymysql2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
     - cp .travis.databases.json tornado_mysql/tests/databases.json
 
-script: tox -e $TOX_ENV
+script: ./runtests.py

README.rst

@@ -9,6 +9,24 @@ Tornado-MySQL
 
 This package contains a fork of PyMySQL supporting Tornado.
 
+
+WARNING
+-------
+
+This library is experimental and unmaintained.  Don't use for production unless you can fix problem yourself.
+
+If you think async is efficient, you're wrong.  You shoud try thread pool before this.
+See also: http://techspot.zzzeek.org/2015/02/15/asynchronous-python-and-databases/
+
+I don't have motivation to maintain this library.  I won't add new features.  **Please don't send feature request.**
+I'm very lazy about fix bugs.  **Don't expect bugs are fixed when you want**.
+
+Instead, you should use your time and energy to port your project to asyncio and newest Python 3.
+Please don't pay your time for this project.
+
+You can use aio-libs/aiomysql or ``run_in_executor()`` in asyncio.
+
+
 Example
 -------
 

pymysql/tests/test_load_local.py

@@ -3,7 +3,7 @@
 
 setup(
     name="Tornado-MySQL",
-    version="0.5",
+    version="0.5.1",
     url='https://github.com/PyMySQL/Tornado-MySQL',
     author='INADA Naoki',
     author_email='songofacandy@gmail.com',
@@ -17,6 +17,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Development Status :: 3 - Alpha',

setup.py

@@ -322,9 +322,6 @@ def is_resultset_packet(self):
         field_count = ord(self._data[0:1])
         return 1 <= field_count <= 250
 
-    def is_load_local_packet(self):
-        return self._data[0:1] == b'\xfb'
-
     def is_error_packet(self):
         return self._data[0:1] == b'\xff'
 
@@ -437,26 +434,6 @@ def __getattr__(self, key):
         return getattr(self.packet, key)
 
 
-class LoadLocalPacketWrapper(object):
-    """
-    Load Local Packet Wrapper. It uses an existing packet object, and wraps
-    around it, exposing useful variables while still providing access
-    to the original packet objects variables and methods.
-    """
-
-    def __init__(self, from_packet):
-        if not from_packet.is_load_local_packet():
-            raise ValueError(
-                "Cannot create '{0}' object from invalid packet type".format(
-                    self.__class__))
-
-        self.packet = from_packet
-        self.filename = self.packet.get_all_data()[1:]
-        if DEBUG: print("filename=", self.filename)
-
-    def __getattr__(self, key):
-        return getattr(self.packet, key)
-
 
 class Connection(object):
     """
@@ -476,8 +453,7 @@ def __init__(self, host="localhost", user=None, password="",
                  client_flag=0, cursorclass=Cursor, init_command=None,
                  connect_timeout=None, ssl=None, read_default_group=None,
                  compress=None, named_pipe=None, no_delay=False,
-                 autocommit=False, db=None, passwd=None, local_infile=False,
-                 io_loop=None):
+                 autocommit=False, db=None, passwd=None, io_loop=None):
         """
         Establish a connection to the MySQL database. Accepts several
         arguments:
@@ -511,7 +487,6 @@ def __init__(self, host="localhost", user=None, password="",
         no_delay: Disable Nagle's algorithm on the socket
         autocommit: Autocommit mode. None means use server default. (default: False)
         io_loop: Tornado IOLoop
-        local_infile: Boolean to enable the use of LOAD DATA LOCAL command. (default: False)
 
         db: Alias for database. (for compatibility to MySQLdb)
         passwd: Alias for password. (for compatibility to MySQLdb)
@@ -529,9 +504,6 @@ def __init__(self, host="localhost", user=None, password="",
         if compress or named_pipe:
             raise NotImplementedError("compress and named_pipe arguments are not supported")
 
-        if local_infile:
-            client_flag |= CLIENT.LOCAL_FILES
-
         if ssl and ('capath' in ssl or 'cipher' in ssl):
             raise NotImplementedError('ssl options capath and cipher are not supported')
 
@@ -624,6 +596,9 @@ def close(self):
     @gen.coroutine
     def close_async(self):
         """Send the quit message and close the socket"""
+        if self._stream is None or self._stream.closed():
+            self._stream = None
+            return
         send_data = struct.pack('<i', 1) + int2byte(COMMAND.COM_QUIT)
         yield self._stream.write(send_data)
         self.close()
@@ -1060,8 +1035,6 @@ def read(self):
 
             if first_packet.is_ok_packet():
                 self._read_ok_packet(first_packet)
-            elif first_packet.is_load_local_packet():
-                self._read_load_local_packet(first_packet)
             else:
                 yield self._read_result_packet(first_packet)
         finally:
@@ -1094,16 +1067,6 @@ def _read_ok_packet(self, first_packet):
         self.message = ok_packet.message
         self.has_next = ok_packet.has_next
 
-    def _read_load_local_packet(self, first_packet):
-        load_packet = LoadLocalPacketWrapper(first_packet)
-        sender = LoadLocalFile(load_packet.filename, self.connection)
-        sender.send_data()
-
-        ok_packet = self.connection._read_packet()
-        if not ok_packet.is_ok_packet():
-            raise OperationalError(2014, "Commands Out of Sync")
-        self._read_ok_packet(ok_packet)
-
     def _check_packet_is_eof(self, packet):
         if packet.is_eof_packet():
             eof_packet = EOFPacketWrapper(packet)
@@ -1209,39 +1172,4 @@ def _get_descriptions(self):
         self.description = tuple(description)
 
 
-class LoadLocalFile(object):
-    def __init__(self, filename, connection):
-        self.filename = filename
-        self.connection = connection
-
-    def send_data(self):
-        """Send data packets from the local file to the server"""
-        if not self.connection.socket:
-            raise InterfaceError("(0, '')")
-
-        # sequence id is 2 as we already sent a query packet
-        seq_id = 2
-        try:
-            with open(self.filename, 'rb') as open_file:
-                chunk_size = MAX_PACKET_LEN
-                prelude = b""
-                packet = b""
-                packet_size = 0
-
-                while True:
-                    chunk = open_file.read(chunk_size)
-                    if not chunk:
-                        break
-                    packet = struct.pack('<i', len(chunk))[:3] + int2byte(seq_id)
-                    format_str = '!{0}s'.format(len(chunk))
-                    packet += struct.pack(format_str, chunk)
-                    self.connection._write_bytes(packet)
-                    seq_id += 1
-        except IOError:
-            raise OperationalError(1017, "Can't find file '{0}'".format(self.filename))
-        finally:
-            # send the empty packet to signify we are done sending data
-            packet = struct.pack('<i', 0)[:3] + int2byte(seq_id)
-            self.connection._write_bytes(packet)
-
 # g:khuno_ignore='E226,E301,E701'

tornado_mysql/connections.py

@@ -230,7 +230,7 @@ def callproc(self, procname, args=()):
                                        for i in range_type(len(args))]))
         yield self._query(q)
         self._executed = q
-        yield gen.Return(args)
+        raise gen.Return(args)
 
     def fetchone(self):
         ''' Fetch the next row '''
@@ -302,7 +302,10 @@ def _do_get_result(self):
     def _show_warnings(self, conn):
         ws = yield conn.show_warnings()
         for w in ws:
-            warnings.warn(w[-1], err.Warning, 4)
+            msg = w[-1]
+            if PY2 and isinstance(msg, unicode):
+                msg = msg.encode('utf-8', 'replace')
+            warnings.warn(msg, err.Warning, 4)
 
     def __iter__(self):
         return iter(self.fetchone, None)