python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 19:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate waiter (#285)

Browse Source
This commit is contained in:
INADA Naoki
2018-11-05 21:28:05 +09:00
committed by GitHub
parent 5376426494
commit 21170a7639
4 changed files with 9 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MySQLdb/connections.py
View File

@ -200,6 +200,10 @@ class Connection(_mysql.connection):
# PEP-249 requires autocommit to be initially off # PEP-249 requires autocommit to be initially off
autocommit = kwargs2.pop('autocommit', False) autocommit = kwargs2.pop('autocommit', False)
self.waiter = kwargs2.pop('waiter', None) self.waiter = kwargs2.pop('waiter', None)
if self.waiter:
from warnings import warn
warn("waiter is deprecated and will be removed in 1.4.",
DeprecationWarning, 2)
super(Connection, self).__init__(*args, **kwargs2) super(Connection, self).__init__(*args, **kwargs2)
self.cursorclass = cursorclass self.cursorclass = cursorclass
@ -325,12 +329,10 @@ class Connection(_mysql.connection):
return s return s
def begin(self): def begin(self):
"""Explicitly begin a connection. Non-standard. """Explicitly begin a connection.
DEPRECATED: Will be removed in 1.3.
Use an SQL BEGIN statement instead.""" This method is not used when autocommit=False (default).
from warnings import warn """
warn("begin() is non-standard and will be removed in 1.4",
DeprecationWarning, 2)
self.query("BEGIN") self.query("BEGIN")
if not hasattr(_mysql.connection, 'warning_count'): if not hasattr(_mysql.connection, 'warning_count'):

2
_mysql.c
View File

@ -756,7 +756,7 @@ static int _mysql_ConnectionObject_clear(
} }
static char _mysql_ConnectionObject_fileno__doc__[] = static char _mysql_ConnectionObject_fileno__doc__[] =
"Return underlaying fd for connection"; "Return underlaying fd for connection (deprecated)";
static PyObject * static PyObject *
_mysql_ConnectionObject_fileno( _mysql_ConnectionObject_fileno(

24
samples/waiter_gevent.py
View File

@ -1,24 +0,0 @@
from __future__ import print_function
"""Demo using Gevent with mysqlclient."""
import gevent.hub
import MySQLdb
def gevent_waiter(fd, hub=gevent.hub.get_hub()):
hub.wait(hub.loop.io(fd, 1))
def f(n):
conn = MySQLdb.connect(user='root', waiter=gevent_waiter)
cur = conn.cursor()
cur.execute("SELECT SLEEP(%s)", (n,))
cur.execute("SELECT 1+%s", (n,))
print(cur.fetchall()[0])
gevent.spawn(f, 1)
gevent.spawn(f, 2)
gevent.spawn(f, 3)
gevent.spawn(f, 4)
gevent.sleep(5)

19
samples/waiter_meinheld.py
View File

@ -1,19 +0,0 @@
import meinheld
import MySQLdb
def meinheld_waiter(fd):
meinheld.server.trampoline(fd, read=True, timeout=10)
def app(env, start):
cont = b"Hello, World\n"
conn = MySQLdb.connect(user="root", waiter=meinheld_waiter)
cur = conn.cursor()
cur.execute("SELECT SLEEP(2)")
start(b"200 OK", [('Content-Type', 'text/plain'), ('Content-Length', str(len(cont)))])
return [cont]
meinheld.server.listen(("0.0.0.0", 8080))
meinheld.server.run(app)