From 50e077ee52b404092cc4fc1969169ed5ed00e9f5 Mon Sep 17 00:00:00 2001 From: Michael Trier Date: Fri, 2 Jan 2009 03:29:33 +0000 Subject: Cleanup of r5556. Makes the description_encoding less public since this is a workaround for the pyodbc dbapi. --- lib/sqlalchemy/engine/default.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/engine/default.py') diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 8a44bac74..590159e2b 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -42,7 +42,7 @@ class DefaultDialect(base.Dialect): def __init__(self, convert_unicode=False, assert_unicode=False, encoding='utf-8', paramstyle=None, dbapi=None, - label_length=None, description_encoding='utf-8', **kwargs): + label_length=None, **kwargs): self.convert_unicode = convert_unicode self.assert_unicode = assert_unicode self.encoding = encoding @@ -60,7 +60,7 @@ class DefaultDialect(base.Dialect): if label_length and label_length > self.max_identifier_length: raise exc.ArgumentError("Label length of %d is greater than this dialect's maximum identifier length of %d" % (label_length, self.max_identifier_length)) self.label_length = label_length - self.description_encoding = description_encoding + self.description_encoding = getattr(self, 'description_encoding', encoding) def type_descriptor(self, typeobj): """Provide a database-specific ``TypeEngine`` object, given -- cgit v1.2.1