From d0e94fb15b57cb5a4b4ecd301e58ccbccc5b3363 Mon Sep 17 00:00:00 2001 From: adustman Date: Wed, 3 Jul 2002 14:40:12 +0000 Subject: [PATCH] Passing both conv and unicode to connect was broken (Skip Montanaro) --- MySQLdb/MySQLdb/connections.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/MySQLdb/connections.py index 33deef6..ca4b360 100644 --- a/MySQLdb/MySQLdb/connections.py +++ b/MySQLdb/MySQLdb/connections.py @@ -93,7 +93,9 @@ class Connection(ConnectionBase): from converters import conversions import types kwargs2 = kwargs.copy() - if not kwargs.has_key('conv'): + if kwargs.has_key('conv'): + kwargs2['conv'] = conv = kwargs['conv'] + else: kwargs2['conv'] = conv = conversions.copy() if kwargs.has_key('cursorclass'): self.cursorclass = kwargs['cursorclass']