diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/MySQLdb/connections.py index 2ae98b8..23ea410 100644 --- a/MySQLdb/MySQLdb/connections.py +++ b/MySQLdb/MySQLdb/connections.py @@ -103,10 +103,6 @@ class Connection: def get_server_info(self): return self._db.get_server_info() def info(self): return self._db.info() def kill(self, p): return self._db.kill(p) - def list_dbs(self): return self._db.list_dbs().fetch_row(0) - def list_fields(self, table): return self._db.list_fields(table).fetch_row(0) - def list_processes(self): return self._db.list_processes().fetch_row(0) - def list_tables(self, db): return self._db.list_tables(db).fetch_row(0) def field_count(self): return self._db.field_count() num_fields = field_count # used prior to MySQL-3.22.24 def ping(self): return self._db.ping() diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c index 554a74b..a025bea 100644 --- a/MySQLdb/_mysql.c +++ b/MySQLdb/_mysql.c @@ -976,77 +976,6 @@ _mysql_ConnectionObject_kill( return Py_None; } -static PyObject * -_mysql_ConnectionObject_list_dbs( - _mysql_ConnectionObject *self, - PyObject *args) -{ - MYSQL_RES *result; - char *wild = NULL; - - if (!PyArg_ParseTuple(args, "|s:list_dbs", &wild)) return NULL; - check_connection(self); - Py_BEGIN_ALLOW_THREADS - result = mysql_list_dbs(&(self->connection), wild); - Py_END_ALLOW_THREADS - if (!result) return _mysql_Exception(self); - return (PyObject *) _mysql_ResultObject_New(self, result, 0, - self->converter); -} - -static PyObject * -_mysql_ConnectionObject_list_fields( - _mysql_ConnectionObject *self, - PyObject *args) -{ - MYSQL_RES *result; - char *wild = NULL, *table; - - if (!PyArg_ParseTuple(args, "s|s:list_fields", &table, &wild)) return NULL; - check_connection(self); - Py_BEGIN_ALLOW_THREADS - result = mysql_list_fields(&(self->connection), table, wild); - Py_END_ALLOW_THREADS - if (!result) return _mysql_Exception(self); - return (PyObject *) _mysql_ResultObject_New(self, result, 0, - self->converter); -} - -static PyObject * -_mysql_ConnectionObject_list_processes( - _mysql_ConnectionObject *self, - PyObject *args) -{ - MYSQL_RES *result; - - if (!PyArg_NoArgs(args)) return NULL; - check_connection(self); - Py_BEGIN_ALLOW_THREADS - result = mysql_list_processes(&(self->connection)); - Py_END_ALLOW_THREADS - if (!result) return _mysql_Exception(self); - return (PyObject *) _mysql_ResultObject_New(self, result, 0, - self->converter); -} - -static PyObject * -_mysql_ConnectionObject_list_tables( - _mysql_ConnectionObject *self, - PyObject *args) -{ - MYSQL_RES *result; - char *wild = NULL; - - if (!PyArg_ParseTuple(args, "|s:list_tables", &wild)) return NULL; - check_connection(self); - Py_BEGIN_ALLOW_THREADS - result = mysql_list_tables(&(self->connection), wild); - Py_END_ALLOW_THREADS - if (!result) return _mysql_Exception(self); - return (PyObject *) _mysql_ResultObject_New(self, result, 0, - self->converter); -} - static PyObject * _mysql_ConnectionObject_field_count( _mysql_ConnectionObject *self, @@ -1332,10 +1261,6 @@ static PyMethodDef _mysql_ConnectionObject_methods[] = { {"info", (PyCFunction)_mysql_ConnectionObject_info, 0}, {"insert_id", (PyCFunction)_mysql_ConnectionObject_insert_id, 0}, {"kill", (PyCFunction)_mysql_ConnectionObject_kill, 1}, - {"list_dbs", (PyCFunction)_mysql_ConnectionObject_list_dbs, 1}, - {"list_fields", (PyCFunction)_mysql_ConnectionObject_list_fields, 1}, - {"list_processes", (PyCFunction)_mysql_ConnectionObject_list_processes, 0}, - {"list_tables", (PyCFunction)_mysql_ConnectionObject_list_tables, 1}, {"ping", (PyCFunction)_mysql_ConnectionObject_ping, 0}, {"query", (PyCFunction)_mysql_ConnectionObject_query, 1}, {"select_db", (PyCFunction)_mysql_ConnectionObject_select_db, 1}, diff --git a/MySQLdb/doc/MySQLdb.sgml b/MySQLdb/doc/MySQLdb.sgml index d1cc25c..f28313e 100644 --- a/MySQLdb/doc/MySQLdb.sgml +++ b/MySQLdb/doc/MySQLdb.sgml @@ -170,10 +170,6 @@ object methods. Their use is non-portable. @ mysql_get_server_info() | conn.get_server_info() @ mysql_info() | conn.info() @ mysql_insert_id() | conn.insert_id() -@ mysql_list_dbs() | conn.list_dbs() -@ mysql_list_fields() | conn.list_fields() -@ mysql_list_processes() | conn.list_processes() -@ mysql_list_tables() | conn.list_tables() @ mysql_num_fields() | result.num_fields() @ mysql_num_rows() | result.num_rows() @ mysql_options() | _mysql.connect() diff --git a/MySQLdb/setup.py b/MySQLdb/setup.py index d6dd261..e8c8303 100644 --- a/MySQLdb/setup.py +++ b/MySQLdb/setup.py @@ -75,7 +75,7 @@ MySQLdb. MySQLdb is free software. setup (# Distribution meta-data name = "MySQL-python", - version = "0.9.0c1", + version = "0.9.0c2", description = "An interface to MySQL", long_description=long_description, author = "Andy Dustman",