inlined encoding of result column names

2 files changed, 1 insertions, 6 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 9f8e8734e..78eb0922e 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1174,7 +1174,7 @@ class ResultProxy(object):
 
             for i, item in enumerate(metadata):
                 # sqlite possibly prepending table name to colnames so strip
-                colname = self.dialect.decode_result_columnname(item[0].split('.')[-1])
+                colname = (item[0].split('.')[-1]).decode(self.dialect.encoding)
                 if self.context.typemap is not None:
                     type = self.context.typemap.get(colname.lower(), typemap.get(item[1], types.NULLTYPE))
                 else:
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index db22b8aaa..a9ee02c1c 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -22,11 +22,6 @@ class DefaultDialect(base.Dialect):
         self.dbapi = dbapi
         self._figure_paramstyle(paramstyle=paramstyle, default=default_paramstyle)
     
-    def decode_result_columnname(self, name):
-        """decode a name found in cursor.description to a unicode object."""
-        
-        return name.decode(self.encoding)
-        
     def dbapi_type_map(self):
         # most DBAPIs have problems with this (such as, psycocpg2 types 
         # are unhashable).  So far Oracle can return it.