Remove waiter option

methane · methane · commit de44ff07e7c1 · 2018-12-04T20:59:16.000+09:00
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -16,6 +16,7 @@ Release: TBD
 * Remove context manager API from Connection.  It was for transaction.
   New context manager API for closing connection will be added in future version.
 
+* Remove ``waiter`` option from Connection.
 
 ======================
  What's new in 1.3.14
diff --git a/MySQLdb/connections.py b/MySQLdb/connections.py
@@ -50,7 +50,6 @@ class Connection(_mysql.connection):
     """MySQL Database Connection Object"""
 
     default_cursor = cursors.Cursor
-    waiter = None
 
     def __init__(self, *args, **kwargs):
         """
@@ -173,11 +172,6 @@ class object, used to create cursors (keyword only)
 
         # PEP-249 requires autocommit to be initially off
         autocommit = kwargs2.pop('autocommit', False)
-        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)
         self.cursorclass = cursorclass
@@ -246,12 +240,7 @@ def query(self, query):
         # Since _mysql releases GIL while querying, we need immutable buffer.
         if isinstance(query, bytearray):
             query = bytes(query)
-        if self.waiter is not None:
-            self.send_query(query)
-            self.waiter(self.fileno())
-            self.read_query_result()
-        else:
-            _mysql.connection.query(self, query)
+        _mysql.connection.query(self, query)
 
     def _bytes_literal(self, bs):
         assert isinstance(bs, (bytes, bytearray))
