Mercurial > hg
changeset 10481:3062af0ba177 stable
bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 15 Feb 2010 09:57:11 +0100 |
| parents | 3076b39d7f3e |
| children | 95265afff99f |
| files | hgext/bugzilla.py |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/bugzilla.py Mon Feb 15 00:16:59 2010 -0800 +++ b/hgext/bugzilla.py Mon Feb 15 09:57:11 2010 +0100 @@ -145,7 +145,7 @@ from mercurial import cmdutil, templater, util import re, time -mysqldb = None +MySQLdb = None def buglist(ids): return '(' + ','.join(map(str, ids)) + ')' @@ -165,7 +165,7 @@ self.ui.readconfig(usermap, sections=['usermap']) self.ui.note(_('connecting to %s:%s as %s, password %s\n') % (host, db, user, '*' * len(passwd))) - self.conn = mysqldb.connect(host=host, user=user, passwd=passwd, + self.conn = MySQLdb.connect(host=host, user=user, passwd=passwd, db=db, connect_timeout=timeout) self.cursor = self.conn.cursor() self.longdesc_id = self.get_longdesc_id() @@ -177,7 +177,7 @@ self.ui.note(_('query: %s %s\n') % (args, kwargs)) try: self.cursor.execute(*args, **kwargs) - except mysqldb.MySQLError: + except MySQLdb.MySQLError: self.ui.note(_('failed query: %s %s\n') % (args, kwargs)) raise @@ -419,9 +419,9 @@ bugzilla bug id. only add a comment once per bug, so same change seen multiple times does not fill bug with duplicate data.''' try: - import mysqldb as mysql - global mysqldb - mysqldb = mysql + import MySQLdb as mysql + global MySQLdb + MySQLdb = mysql except ImportError, err: raise util.Abort(_('python mysql support not available: %s') % err) @@ -436,6 +436,6 @@ for id in ids: bz.update(id, ctx) bz.notify(ids, util.email(ctx.user())) - except mysqldb.MySQLError, err: + except MySQLdb.MySQLError, err: raise util.Abort(_('database error: %s') % err[1])