From bd99b4d8575d2f49b0d5de355f588060d32fe760 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Tue, 14 Apr 2015 23:29:39 +0900 Subject: [PATCH 1/2] 0.5 --- MANIFEST.in | 1 - setup.py | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index c57b5ea..c2442c6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,2 @@ include README.rst LICENSE CHANGELOG include runtests.py tox.ini -include example.py example_pool diff --git a/setup.py b/setup.py index c545f0d..cc0e1a7 100755 --- a/setup.py +++ b/setup.py @@ -1,21 +1,14 @@ #!/usr/bin/env python from setuptools import setup, find_packages -try: - with open('README.rst') as f: - readme = f.read() -except IOError: - readme = '' - setup( name="Tornado-MySQL", - version="0.4", + version="0.5", url='https://github.com/PyMySQL/Tornado-MySQL', author='INADA Naoki', author_email='songofacandy@gmail.com', description='Pure Python MySQL Driver for Tornado', install_requires=['tornado>=4.0'], - long_description=readme, license="MIT", packages=find_packages(), classifiers=[ From 4951ec25a49bec5d25ead95b162b4b61fd092020 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Fri, 17 Apr 2015 13:00:28 +0900 Subject: [PATCH 2/2] Fix _get_conn() hungup when max_open_connections=0 Fixes #6 --- tornado_mysql/pools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tornado_mysql/pools.py b/tornado_mysql/pools.py index bc811ef..f7c4b69 100644 --- a/tornado_mysql/pools.py +++ b/tornado_mysql/pools.py @@ -73,7 +73,7 @@ def _get_conn(self): return fut # Open new connection - if self.max_open and self._opened_conns < self.max_open: + if self.max_open == 0 or self._opened_conns < self.max_open: self._opened_conns += 1 _debug("Creating new connection:", self.stat()) return connect(**self.connect_kwargs)